diff --git a/Builder/ClientBuilder.php b/Builder/ClientBuilder.php
new file mode 100644
index 0000000..dce1d2f
--- /dev/null
+++ b/Builder/ClientBuilder.php
@@ -0,0 +1,80 @@
+<?php
+namespace Ddeboer\GuzzleBundle\Builder;
+
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+
+use Ddeboer\GuzzleBundle\Client;
+use Guzzle\Service\Description\ServiceDescription;
+use Guzzle\Service\Description\ApiCommand;
+
+use Ddeboer\GuzzleBundle\Inspector;
+
+/**
+ * Client builder factory
+ */
+class ClientBuilder
+{
+    protected $clientClass;
+    protected $descriptionClass;
+
+    protected $commands;
+    protected $config;
+    protected $dispatcher;
+    protected $inspector;
+
+    /**
+     * Constructor
+     *
+     * @param string                   $clientClass
+     * @param string                   $descriptionClass
+     * @param EventDispatcherInterface $dispatcher
+     * @param Inspector                $inspector
+     * @param ApiCommand[]             $commands
+     * @param array                    $config
+     */
+    public function __construct(
+        $clientClass,
+        $descriptionClass,
+        EventDispatcherInterface $dispatcher,
+        Inspector $inspector,
+        array $commands,
+        array $config = array()
+    ) {
+        $this->clientClass      = $clientClass;
+        $this->descriptionClass = $descriptionClass;
+        $this->dispatcher       = $dispatcher;
+        $this->inspector        = $inspector;
+        $this->commands         = $commands;
+        $this->config           = $config;
+    }
+
+    /**
+     * Create client instance
+     *
+     * @param string $clientId Client id, needed for commands association
+     * @param string $baseUrl  Base url
+     * @param string $username User name
+     * @param string $password Password
+     * @param array  $config   Other config options, optional
+     *
+     * @return Client
+     */
+    public function factory($clientId, $baseUrl, $username, $password, array $config = array())
+    {
+        /** @var $client Client */
+        $client = new $this->clientClass($baseUrl, array_merge($this->config, $config, array(
+            'username' => $username,
+            'password' => $password
+        )));
+        $client->setEventDispatcher($this->dispatcher);
+        $client->setInspector($this->inspector);
+
+        /** @var $serviceDescription ServiceDescription */
+        $commands = $this->commands[$clientId];
+
+        $serviceDescription = new $this->descriptionClass($commands);
+        $client->setDescription($serviceDescription);
+
+        return $client;
+    }
+}
diff --git a/Builder/CommandBuilder.php b/Builder/CommandBuilder.php
new file mode 100644
index 0000000..ba06002
--- /dev/null
+++ b/Builder/CommandBuilder.php
@@ -0,0 +1,50 @@
+<?php
+namespace Ddeboer\GuzzleBundle\Builder;
+
+use Guzzle\Service\Description\ArrayDescriptionBuilder;
+use Guzzle\Service\Description\ApiCommand;
+use Guzzle\Service\Description\ApiCommandInterface;
+use Guzzle\Service\Exception\DescriptionBuilderException;
+use Guzzle\Service\Description\ServiceDescription;
+class CommandBuilder
+{
+    protected $defaultClass = ServiceDescription::DEFAULT_COMMAND_CLASS;
+
+    /**
+     * @param string                $name
+     * @param ApiCommandInterface[] $extends
+     *
+     * @return ApiCommand
+     *
+     * @throws \Guzzle\Service\Exception\DescriptionBuilderException
+     * @throws \InvalidArgumentException
+     */
+    public function build(
+        $name,
+        array $command = array(),
+        array $params  = array(),
+        array $extends = array(),
+        $class = null
+    ) {
+        // Extend other commands
+        if ($extends) {
+            $resolvedParams = array();
+
+            foreach ($extends as $extendedCommand) {
+                if (!$extendedCommand instanceof ApiCommandInterface) {
+                    throw new DescriptionBuilderException("{$name} extends missing command {$extendedCommand}");
+                }
+                $toArray        = $extendedCommand->toArray();
+                $resolvedParams = array_merge($resolvedParams, $toArray['params']);
+                $command        = array_merge($toArray, $command);
+            }
+
+            $params = array_merge($resolvedParams, $params);
+        }
+
+        return new ApiCommand(array_merge($command, array(
+            'params' => $params,
+            'class'  => $class ? str_replace('.', '\\', $class) : $this->defaultClass,
+        )));
+    }
+}
diff --git a/Builder/TypeBuilder.php b/Builder/TypeBuilder.php
new file mode 100644
index 0000000..2f27c57
--- /dev/null
+++ b/Builder/TypeBuilder.php
@@ -0,0 +1,15 @@
+<?php
+namespace Ddeboer\GuzzleBundle\Builder;
+
+use Guzzle\Service\Client;
+use Guzzle\Service\Description\ServiceDescription;
+use Guzzle\Service\Description\ApiCommand;
+/**
+ * Client builder factory
+ */
+class TypeBuilder
+{
+    public function buildFromArray(array $command)
+    {
+    }
+}
diff --git a/Client.php b/Client.php
new file mode 100644
index 0000000..86f758a
--- /dev/null
+++ b/Client.php
@@ -0,0 +1,31 @@
+<?php
+namespace Ddeboer\GuzzleBundle;
+
+use Guzzle\Service\Client as BaseClient;
+use Guzzle\Service\Command\AbstractCommand;
+
+/**
+ * Client
+ */
+class Client extends BaseClient
+{
+    protected $inspector;
+
+    public function setInspector(Inspector $inspector)
+    {
+        $this->inspector = $inspector;
+
+        return $inspector;
+    }
+    /**
+     * {@inheritDoc}
+     */
+    public function getCommand($name, array $args = array())
+    {
+        $command = parent::getCommand($name, $args);
+        /** @var $command AbstractCommand */
+        $command->setInspector($this->inspector);
+
+        return $command;
+    }
+}
diff --git a/DdeboerGuzzleBundle.php b/DdeboerGuzzleBundle.php
index 95f381f..bd877c3 100644
--- a/DdeboerGuzzleBundle.php
+++ b/DdeboerGuzzleBundle.php
@@ -12,7 +12,21 @@
 namespace Ddeboer\GuzzleBundle;
 
 use Symfony\Component\HttpKernel\Bundle\Bundle;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Compiler\PassConfig;
+
+use Ddeboer\GuzzleBundle\DependencyInjection\Compiler\GrabCommandsPass;
+
 
 class DdeboerGuzzleBundle extends Bundle
 {
+    /**
+     * {@inheritdoc}
+     */
+    public function build(ContainerBuilder $container)
+    {
+        parent::build($container);
+
+        $container->addCompilerPass(new GrabCommandsPass());
+    }
 }
diff --git a/DependencyInjection/CommandConfiguration.php b/DependencyInjection/CommandConfiguration.php
new file mode 100644
index 0000000..f4a31e9
--- /dev/null
+++ b/DependencyInjection/CommandConfiguration.php
@@ -0,0 +1,54 @@
+<?php
+
+namespace Ddeboer\GuzzleBundle\DependencyInjection;
+
+use Symfony\Component\Config\Definition\Builder\TreeBuilder;
+use Symfony\Component\Config\Definition\ConfigurationInterface;
+
+class CommandConfiguration implements ConfigurationInterface
+{
+    public function getConfigTreeBuilder()
+    {
+        $builder = new TreeBuilder();
+
+        $builder
+            ->root('guzzle')
+                ->children()
+                    ->arrayNode('clients')
+                        ->useAttributeAsKey('name')
+                        ->prototype('array')
+                            ->children()
+                                ->scalarNode('name')->end()
+                                ->arrayNode('commands')
+                                    ->useAttributeAsKey('name')
+                                    ->prototype('array')
+                                        ->children()
+                                            ->scalarNode('name')->end()
+                                            ->scalarNode('method')->defaultValue('GET')->end()
+                                            ->scalarNode('uri')->end()
+                                            ->scalarNode('class')->end()
+                                            ->scalarNode('extends')->end()
+                                            ->scalarNode('doc')->end()
+                                            ->arrayNode('params')
+                                                ->useAttributeAsKey('name')
+                                                ->prototype('array')
+                                                    ->children()
+                                                        ->scalarNode('doc')->end()
+                                                        ->scalarNode('name')->end()
+                                                        ->scalarNode('type')->end()
+                                                        ->booleanNode('required')->defaultValue(false)->end()
+                                                    ->end()
+                                                ->end()
+                                            ->end()
+                                        ->end()
+                                    ->end()
+                                ->end()
+                            ->end()
+                        ->end()
+                    ->end()
+                ->end()
+            ->end();
+
+        return $builder;
+    }
+}
diff --git a/DependencyInjection/Compiler/GrabCommandsPass.php b/DependencyInjection/Compiler/GrabCommandsPass.php
new file mode 100644
index 0000000..87a297b
--- /dev/null
+++ b/DependencyInjection/Compiler/GrabCommandsPass.php
@@ -0,0 +1,53 @@
+<?php
+namespace Ddeboer\GuzzleBundle\DependencyInjection\Compiler;
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\Config\Definition\Processor;
+
+use Millwright\ConfigurationBundle\ContainerUtil as Util;
+use Millwright\ConfigurationBundle\PhpUtil;
+
+use Ddeboer\GuzzleBundle\DependencyInjection\CommandConfiguration;
+use Guzzle\Service\Inspector;
+
+/**
+ * FormCompilerPass
+ */
+class GrabCommandsPass implements CompilerPassInterface
+{
+    /**
+     * Process
+     *
+     * @param ContainerBuilder $container
+     *
+     * @return void
+     */
+    public function process(ContainerBuilder $container)
+    {
+        $definitions = Util::getDefinitionsByTag('guzzle_type', $container);
+
+        $inspector = $container->getDefinition('guzzle.inspector');
+
+        foreach ($definitions as $name => $definition) {
+            $properties = $definition->getProperties();
+            $inspector->addMethodCall('setConstraint', array(
+                $name,
+                $definition,
+                $properties
+            ));
+        }
+
+        $definitionGroups = Util::getDefinitionsByTag('guzzle_command', $container, true);
+
+        $result = array();
+        foreach ($definitionGroups as $clientId => $definitions) {
+            foreach ($definitions as $definition) {
+                $args = $definition->getArguments();
+                $result[$clientId][$args['name']] = $definition;
+            }
+        }
+
+        $container->getDefinition('guzzle.client_builder')->replaceArgument(4, $result);
+    }
+}
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index 56c43f2..8e3ed5b 100644
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -34,6 +34,22 @@ public function getConfigTreeBuilder()
                             ->scalarNode('configuration_file')
                                 ->defaultValue('%kernel.root_dir%/config/webservices.xml')
                             ->end()
+                            ->arrayNode('configuration')
+                                ->useAttributeAsKey('name')
+                                ->prototype('array')
+                                    ->children()
+                                        ->scalarNode('name')->end()
+                                        ->scalarNode('method')->defaultValue('GET')->end()
+                                        ->scalarNode('uri')->end()
+                                        ->scalarNode('class')->end()
+                                        ->scalarNode('extends')->end()
+                                        ->arrayNode('params')
+                                            ->useAttributeAsKey('params')->prototype('scalar')->end()
+                                        ->end()
+                                    ->end()
+                                ->end()
+                            ->end()
+
                         ->end()
                     ->end()
                     ->booleanNode('logging')->defaultValue($this->debug)->end()
diff --git a/DependencyInjection/DdeboerGuzzleExtension.php b/DependencyInjection/DdeboerGuzzleExtension.php
index d8b0279..8736799 100644
--- a/DependencyInjection/DdeboerGuzzleExtension.php
+++ b/DependencyInjection/DdeboerGuzzleExtension.php
@@ -18,13 +18,25 @@ public function load(array $configs, ContainerBuilder $container)
             new FileLocator(__DIR__.'/../Resources/config')
         );
         $loader->load('services.xml');
+        $loader->load('validators.xml');
 
         $processor = new Processor();
         $configuration = new Configuration($container->getParameter('kernel.debug'));
         $config = $processor->processConfiguration($configuration, $configs);
 
-        $container->setParameter('guzzle.service_builder.configuration_file',
-                $config['service_builder']['configuration_file']);
+        if (isset($config['service_builder'])) {
+            $container->setParameter('guzzle.service_builder.configuration',
+                $config['service_builder']['configuration']);
+
+            if (empty($config['service_builder']['configuration'])) {
+                $container->setParameter('guzzle.service_builder.configuration',
+                    $config['service_builder']['configuration_file']);
+            }
+        }
+
+        $clients = isset($config['clients']) ? $config['clients'] : array();
+
+        $container->setParameter('guzzle.clients', $clients);
 
         if ($config['logging']) {
             $container->findDefinition('guzzle.data_collector')
diff --git a/Inspector.php b/Inspector.php
new file mode 100644
index 0000000..4f51dde
--- /dev/null
+++ b/Inspector.php
@@ -0,0 +1,88 @@
+<?php
+
+namespace Ddeboer\GuzzleBundle;
+
+use Guzzle\Common\Collection;
+use Guzzle\Common\Exception\InvalidArgumentException;
+use Guzzle\Common\Validation\ConstraintInterface;
+use Guzzle\Service\Exception\ValidationException;
+
+use Guzzle\Service\Inspector as BaseInspector;
+
+/**
+ * Prepares configuration settings with default values and ensures that required
+ * values are set.  Holds references to validation constraints and their default
+ * values.
+ */
+class Inspector extends BaseInspector
+{
+    /**
+     * @var ConstraintInterface[]
+     */
+    protected $constraints = array();
+
+    protected $constraintArgs = array();
+
+    /**
+     * Constructor to create a new Inspector
+     */
+    public function __construct()
+    {
+    }
+
+    /**
+     * Get an instance of the Inspector
+     *
+     * @return Inspector
+     */
+    public static function getInstance()
+    {
+        throw new \ErrorException('Deprecated');
+    }
+
+    public static function prepareConfig(array $config = null, array $defaults = null, array $required = null)
+    {
+        throw new \ErrorException('Deprecated');
+    }
+
+    /**
+     * Register a constraint class with a special name
+     *
+     * @param string $name    Name of the constraint to register
+     * @param ConstraintInterface $constraint
+     * @param array               $args Constraint validationg args
+     *
+     * @return Inspector
+     */
+    public function setConstraint($name, ConstraintInterface $constraint, array $args = null)
+    {
+        $this->constraints[$name]    = $constraint;
+        $this->constraintArgs[$name] = $args;
+
+        return $this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getConstraint($name)
+    {
+        if (!isset($this->constraints[$name])) {
+            throw new InvalidArgumentException($name . ' has not been registered');
+        }
+
+        return $this->constraints[$name];
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function validateConstraint($name, $value, array $args = null)
+    {
+        if (!$args) {
+            $args = isset($this->constraintArgs[$name]) ? $this->constraintArgs[$name] : array();
+        }
+
+        return $this->getConstraint($name)->validate($value, $args);
+    }
+}
diff --git a/README.md b/README.md
index e6a667e..850badd 100644
--- a/README.md
+++ b/README.md
@@ -85,9 +85,33 @@ public function registerBundles()
 
 ``` yaml
 # app/config/config.yml
-ddeboer_guzzle: 
+ddeboer_guzzle:
     service_builder:
-        configuration_file: "%kernel.root_dir%/config/webservices.xml"
+        configuration:
+            aws:
+                params:
+                    access_key: 12345
+                    secret_key: abcd
+            s3:
+                class: Guzzle\Aws\S3\S3Client
+                extends: aws
+                params:
+                    subdomain: michael
+            unfuddle:
+                class: Guzzle\Unfuddle\UnfuddleClient
+                params:
+                    username: test-user
+                    password: test-password
+                    subdomain: test
+```
+
+Or
+
+``` yaml
+# app/config/config.yml
+ddeboer_guzzle:
+    service_builder:
+        configuration_file: %kernel.root_dir%/config/webservices.xml
 ```
 
 And add a Guzzle services configuration file. See the [Guzzle documentation](http://guzzlephp.org/tour/using_services.html#instantiating-web-service-clients-using-a-servicebuilder).
diff --git a/Resources/config/services.xml b/Resources/config/services.xml
index c7b931d..4223c78 100644
--- a/Resources/config/services.xml
+++ b/Resources/config/services.xml
@@ -7,6 +7,18 @@
     <parameters>
         <parameter key="guzzle.service_builder.class">Guzzle\Service\Builder\ServiceBuilder</parameter>
         <parameter key="guzzle.service_builder_factory.class">Guzzle\Service\Builder\ServiceBuilder</parameter>
+        <parameter key="guzzle.service_description.class">Guzzle\Service\Description\ServiceDescription</parameter>
+        <parameter key="guzzle.service_builder.configuration"></parameter>
+
+        <parameter key="guzzle.client.class">Ddeboer\GuzzleBundle\Client</parameter>
+        <parameter key="guzzle.client_builder.class">Ddeboer\GuzzleBundle\Builder\ClientBuilder</parameter>
+        <parameter key="guzzle.clients"></parameter>
+        <parameter key="guzzle.client_builder.config"></parameter>
+
+        <parameter key="guzzle.command.api.class">Guzzle\Service\Description\ApiCommand</parameter>
+        <parameter key="guzzle.command_builder.class">Ddeboer\GuzzleBundle\Builder\CommandBuilder</parameter>
+
+        <parameter key="guzzle.inspector.class">Ddeboer\GuzzleBundle\Inspector</parameter>
 
         <parameter key="guzzle.plugin.service_builder.class">Guzzle\Service\Plugin\PluginCollectionPlugin</parameter>
         <parameter key="guzzle.plugin.data_collector.class">Ddeboer\GuzzleBundle\Guzzle\Http\Plugin\DataCollectorPlugin</parameter>
@@ -23,8 +35,25 @@
     </parameters>
 
     <services>
+
+        <service id="guzzle.inspector" class="%guzzle.inspector.class%">
+        </service>
+
+        <service id="guzzle.client_builder" class="%guzzle.client_builder.class%">
+            <argument type="string">%guzzle.client.class%</argument>
+            <argument type="string">%guzzle.service_description.class%</argument>
+            <argument type="service" id="event_dispatcher"/>
+            <argument type="service" id="guzzle.inspector"/>
+            <argument type="collection">%guzzle.clients%</argument>
+            <argument type="collection">%guzzle.client_builder.config%</argument>
+        </service>
+
+        <service id="guzzle.command_builder" class="%guzzle.command_builder.class%">
+        </service>
+
+
         <service id="guzzle.service_builder" class="%guzzle.service_builder.class%" factory-class="%guzzle.service_builder_factory.class%" factory-method="factory">
-            <argument type="string" id="guzzle.service_builder.configuration_file">%guzzle.service_builder.configuration_file%</argument>
+            <argument id="guzzle.service_builder.configuration">%guzzle.service_builder.configuration%</argument>
 
             <call method="addSubscriber">
                 <argument type="service" id="guzzle.plugin.service_builder" />
diff --git a/Resources/config/validators.xml b/Resources/config/validators.xml
new file mode 100644
index 0000000..4e1f41d
--- /dev/null
+++ b/Resources/config/validators.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+
+    <services>
+
+        <service id="guzzle.validation.blank" class="Guzzle\Common\Validation\Blank" public="false">
+            <tag name="guzzle_type" type="blank" />
+        </service>
+
+        <service id="guzzle.validation.not_blank" class="Guzzle\Common\Validation\NotBlank" public="false">
+            <tag name="guzzle_type" type="not_blank" />
+        </service>
+
+        <service id="guzzle.validation.integer" class="Guzzle\Common\Validation\Numeric" public="false">
+            <tag name="guzzle_type" type="integer" />
+        </service>
+
+        <service id="guzzle.validation.float" class="Guzzle\Common\Validation\Numeric" public="false">
+            <tag name="guzzle_type" type="float" />
+        </service>
+
+        <service id="guzzle.validation.string" class="Guzzle\Common\Validation\Type" public="false">
+            <tag name="guzzle_type" type="string" />
+            <property name="type">string</property>
+        </service>
+
+        <service id="guzzle.validation.file" class="Guzzle\Common\Validation\Type" public="false">
+            <tag name="guzzle_type" type="file" />
+            <property name="type">file</property>
+        </service>
+
+        <service id="guzzle.validation.array" class="Guzzle\Common\Validation\Type" public="false">
+            <tag name="guzzle_type" type="array" />
+            <property name="type">array</property>
+        </service>
+
+        <service id="guzzle.validation.bool" class="Guzzle\Common\Validation\Bool" public="false">
+            <tag name="guzzle_type" type="bool" />
+        </service>
+
+        <service id="guzzle.validation.boolean" class="Guzzle\Common\Validation\Bool" public="false">
+            <tag name="guzzle_type" type="boolean" />
+        </service>
+
+        <service id="guzzle.validation.email" class="Guzzle\Common\Validation\Email" public="false">
+            <tag name="guzzle_type" type="email" />
+        </service>
+
+        <service id="guzzle.validation.ip" class="Guzzle\Common\Validation\Ip" public="false">
+            <tag name="guzzle_type" type="ip" />
+        </service>
+
+        <service id="guzzle.validation.ip" class="Guzzle\Common\Validation\Ip" public="false">
+            <tag name="guzzle_type" type="ip" />
+        </service>
+
+        <service id="guzzle.validation.url" class="Guzzle\Common\Validation\Url" public="false">
+            <tag name="guzzle_type" type="url" />
+        </service>
+
+        <service id="guzzle.validation.class" class="Guzzle\Common\Validation\IsInstanceOf" public="false">
+            <tag name="guzzle_type" type="class" />
+        </service>
+
+        <service id="guzzle.validation.type" class="Guzzle\Common\Validation\Type" public="false">
+            <tag name="guzzle_type" type="type" />
+        </service>
+
+        <service id="guzzle.validation.any_match" class="Guzzle\Common\Validation\AnyMatch" public="false">
+            <tag name="guzzle_type" type="any_match" />
+        </service>
+
+        <service id="guzzle.validation.ctype" class="Guzzle\Common\Validation\Ctype" public="false">
+            <tag name="guzzle_type" type="ctype" />
+        </service>
+
+        <service id="guzzle.validation.choice" class="Guzzle\Common\Validation\Choice" public="false">
+            <tag name="guzzle_type" type="choice" />
+        </service>
+
+        <service id="guzzle.validation.enum" class="Guzzle\Common\Validation\Choice" public="false">
+            <tag name="guzzle_type" type="enum" />
+        </service>
+
+        <service id="guzzle.validation.regex" class="Guzzle\Common\Validation\Regex" public="false">
+            <tag name="guzzle_type" type="regex" />
+        </service>
+
+        <service id="guzzle.validation.date" class="Guzzle\Common\Validation\Type" public="false">
+            <tag name="guzzle_type" type="date" />
+            <property name="type">string</property>
+        </service>
+
+        <service id="guzzle.validation.date_type" class="Guzzle\Common\Validation\Type" public="false">
+            <tag name="guzzle_type" type="date_type" />
+            <property name="type">string</property>
+        </service>
+
+        <service id="guzzle.validation.time" class="Guzzle\Common\Validation\Numeric" public="false">
+            <tag name="guzzle_type" type="time" />
+            <property name="type">string</property>
+        </service>
+    </services>
+
+</container>
diff --git a/composer.json b/composer.json
index 8e83851..64ef27e 100644
--- a/composer.json
+++ b/composer.json
@@ -25,7 +25,8 @@
     "require": {
         "php":                            ">=5.3.2",
         "symfony/symfony":                ">=2.0,<2.2",
-        "guzzle/guzzle":                  "*"
+        "guzzle/guzzle":                  "*",
+        "zerkalica/millwright-configuration-bundle": "dev-master"
     },
 
     "autoload": {