diff --git a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
index 708e3139a..3b558b6d9 100644
--- a/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
+++ b/src/main/java/com/github/dockerjava/api/command/CreateContainerCmd.java
@@ -14,232 +14,228 @@
 import com.github.dockerjava.api.model.RestartPolicy;
 import com.github.dockerjava.api.model.Volume;
 import com.github.dockerjava.api.model.VolumesFrom;
-import com.github.dockerjava.core.command.CreateContainerCmdImpl;
 
-public interface CreateContainerCmd extends DockerCmd<CreateContainerResponse>{
+public interface CreateContainerCmd extends DockerCmd<CreateContainerResponse> {
 
-	public static interface Exec extends DockerCmdExec<CreateContainerCmd, CreateContainerResponse> {
-	}
+    public static interface Exec extends DockerCmdExec<CreateContainerCmd, CreateContainerResponse> {
+    }
 
-	/**
-	 * @throws NotFoundException No such container
-	 * @throws ConflictException Named container already exists
-	 */
+    /**
+     * @throws NotFoundException
+     *             No such container
+     * @throws ConflictException
+     *             Named container already exists
+     */
     @Override
-	public CreateContainerResponse exec() throws NotFoundException,
-			ConflictException;
+    public CreateContainerResponse exec() throws NotFoundException, ConflictException;
 
-	public Bind[] getBinds();
+    public Bind[] getBinds();
 
-	public Capability[] getCapAdd();
+    public Capability[] getCapAdd();
 
-	public Capability[] getCapDrop();
+    public Capability[] getCapDrop();
 
-	public String[] getCmd();
+    public String[] getCmd();
 
-	public String getCpuset();
+    public String getCpuset();
 
-	public int getCpuShares();
+    public int getCpuShares();
 
-	public Device[] getDevices();
+    public Device[] getDevices();
 
-	public String[] getDns();
-	
-	public String[] getDnsSearch();
+    public String[] getDns();
 
-	public String[] getEntrypoint();
+    public String[] getDnsSearch();
 
-	public String[] getEnv();
+    public String[] getEntrypoint();
 
-	public ExposedPort[] getExposedPorts();
-	
-	public String[] getExtraHosts();
+    public String[] getEnv();
 
-	public HostConfig getHostConfig();
+    public ExposedPort[] getExposedPorts();
 
-	public String getHostName();
+    public String[] getExtraHosts();
 
-	public String getImage();
+    public HostConfig getHostConfig();
 
-	public Link[] getLinks();
-	
-	public LxcConf[] getLxcConf();
-	
-	public String getMacAddress();
+    public String getHostName();
 
-	public long getMemoryLimit();
+    public String getDomainName();
 
-	public long getMemorySwap();
+    public String getImage();
 
-	public String getName();
-	
-	public String getNetworkMode();
-	
-	public Ports getPortBindings();
+    public Link[] getLinks();
 
-	public String[] getPortSpecs();
-	
-	public RestartPolicy getRestartPolicy();
+    public LxcConf[] getLxcConf();
 
-	public String getUser();
+    public String getMacAddress();
 
-	public Volume[] getVolumes();
+    public long getMemoryLimit();
 
-	public VolumesFrom[] getVolumesFrom();
+    public long getMemorySwap();
 
-	public String getWorkingDir();
+    public String getName();
 
-	public boolean isAttachStderr();
+    public String getNetworkMode();
 
-	public boolean isAttachStdin();
+    public Ports getPortBindings();
 
-	public boolean isAttachStdout();
+    public String[] getPortSpecs();
 
-	public boolean isNetworkDisabled();
-	
-	public Boolean isPrivileged();
-	
-	public Boolean isPublishAllPorts();
+    public RestartPolicy getRestartPolicy();
 
-	public boolean isStdInOnce();
+    public String getUser();
 
-	public boolean isStdinOpen();
+    public Volume[] getVolumes();
 
-	public boolean isTty();
+    public VolumesFrom[] getVolumesFrom();
 
-	public CreateContainerCmd withAttachStderr(boolean attachStderr);
+    public String getWorkingDir();
 
-	public CreateContainerCmd withAttachStdin(boolean attachStdin);
-	
-	public CreateContainerCmd withAttachStdout(boolean attachStdout);
-	
-	public CreateContainerCmd withBinds(Bind... binds);
-
-	/**
-	 * Add linux <a
-	 * href="http://man7.org/linux/man-pages/man7/capabilities.7.html">kernel
-	 * capability</a> to the container. For example: adding {@link Capability#MKNOD}
-	 * allows the container to create special files using the 'mknod' command.
-	 */
-	public CreateContainerCmd withCapAdd(Capability... capAdd);
-
-	/**
-	 * Drop linux <a
-	 * href="http://man7.org/linux/man-pages/man7/capabilities.7.html">kernel
-	 * capability</a> from the container. For example: dropping {@link Capability#CHOWN}
-	 * prevents the container from changing the owner of any files.
-	 */
-	public CreateContainerCmd withCapDrop(Capability... capDrop);
-
-	public CreateContainerCmd withCmd(String... cmd);
-
-	public CreateContainerCmd withCpuset(String cpuset);
-	
-	public CreateContainerCmd withCpuShares(int cpuShares);
-	
-	/**
-	 * Add host devices to the container
-	 */
-	public CreateContainerCmd withDevices(Device... devices);
-
-	public CreateContainerCmd withNetworkDisabled(boolean disableNetwork);
-
-	/**
-	 * Set custom DNS servers
-	 */
-	public CreateContainerCmd withDns(String... dns);
-	
-	/**
-	 * Set custom DNS search domains
-	 */
-	public CreateContainerCmd withDnsSearch(String... dnsSearch);
-
-	public CreateContainerCmd withEntrypoint(String... entrypoint);
-
-	public CreateContainerCmd withEnv(String... env);
-	
-	public CreateContainerCmd withExposedPorts(ExposedPort... exposedPorts);
-	
-	/**
-	 * Add hostnames to /etc/hosts in the container
-	 */
-	public CreateContainerCmd withExtraHosts(String... extraHosts);
-	
-	public CreateContainerCmd withHostConfig(HostConfig hostConfig);
-
-	public CreateContainerCmd withHostName(String hostName);
-
-	public CreateContainerCmd withImage(String image);
-
-	/**
-	 * Add link to another container.
-	 */
-	public CreateContainerCmd withLinks(Link... links);
-	
-	public CreateContainerCmd withLxcConf(LxcConf... lxcConf);
-
-	public CreateContainerCmd withMemoryLimit(long memoryLimit);
-	
-	public CreateContainerCmd withMemorySwap(long memorySwap);
-	
-	public CreateContainerCmd withName(String name);
-	
-
-	/**
-	 * Set the Network mode for the container
-	 * <ul>
-	 * <li>'bridge': creates a new network stack for the container on the docker
-	 * bridge</li>
-	 * <li>'none': no networking for this container</li>
-	 * <li>'container:<name|id>': reuses another container network stack</li>
-	 * <li>'host': use the host network stack inside the container. Note: the
-	 * host mode gives the container full access to local system services such
-	 * as D-bus and is therefore considered insecure.</li>
-	 * </ul>
-	 */
-	public CreateContainerCmd withNetworkMode(String networkMode);
-	
-	/**
-	 * Add one or more {@link PortBinding}s.
-	 * This corresponds to the <code>--publish</code> (<code>-p</code>)
-	 * option of the <code>docker run</code> CLI command.
-	 */
-	public CreateContainerCmd withPortBindings(PortBinding... portBindings);
-	
-	/**
-	 * Add the port bindings that are contained in the given {@link Ports}
-	 * object.
-	 * 
-	 * @see #withPortBindings(PortBinding...)
-	 */
-	public CreateContainerCmd withPortBindings(Ports portBindings);
-
-	public CreateContainerCmd withPortSpecs(String... portSpecs);
-	
-	public CreateContainerCmd withPrivileged(boolean privileged);
-	
-	public CreateContainerCmd withPublishAllPorts(boolean publishAllPorts);
-	
-	/**
-	 * Set custom {@link RestartPolicy} for the container. Defaults to
-	 * {@link RestartPolicy#noRestart()}
-	 */
-	public CreateContainerCmd withRestartPolicy(RestartPolicy restartPolicy);
-
-	public CreateContainerCmd withStdInOnce(boolean stdInOnce);
-
-	public CreateContainerCmd withStdinOpen(boolean stdinOpen);
-
-	public CreateContainerCmd withTty(boolean tty);
-		
-	public CreateContainerCmd withUser(String user);
-	
-	public CreateContainerCmd withVolumes(Volume... volumes);
-	
-	public CreateContainerCmd withVolumesFrom(VolumesFrom... volumesFrom);
-	
-	public CreateContainerCmd withWorkingDir(String workingDir);
-
-	public CreateContainerCmd withMacAddress(String macAddress);
+    public boolean isAttachStderr();
+
+    public boolean isAttachStdin();
+
+    public boolean isAttachStdout();
+
+    public boolean isNetworkDisabled();
+
+    public Boolean isPrivileged();
+
+    public Boolean isPublishAllPorts();
+
+    public boolean isStdInOnce();
+
+    public boolean isStdinOpen();
+
+    public boolean isTty();
+
+    public CreateContainerCmd withAttachStderr(boolean attachStderr);
+
+    public CreateContainerCmd withAttachStdin(boolean attachStdin);
+
+    public CreateContainerCmd withAttachStdout(boolean attachStdout);
+
+    public CreateContainerCmd withBinds(Bind... binds);
+
+    /**
+     * Add linux <a href="http://man7.org/linux/man-pages/man7/capabilities.7.html">kernel capability</a> to the
+     * container. For example: adding {@link Capability#MKNOD} allows the container to create special files using the
+     * 'mknod' command.
+     */
+    public CreateContainerCmd withCapAdd(Capability... capAdd);
+
+    /**
+     * Drop linux <a href="http://man7.org/linux/man-pages/man7/capabilities.7.html">kernel capability</a> from the
+     * container. For example: dropping {@link Capability#CHOWN} prevents the container from changing the owner of any
+     * files.
+     */
+    public CreateContainerCmd withCapDrop(Capability... capDrop);
+
+    public CreateContainerCmd withCmd(String... cmd);
+
+    public CreateContainerCmd withCpuset(String cpuset);
+
+    public CreateContainerCmd withCpuShares(int cpuShares);
+
+    /**
+     * Add host devices to the container
+     */
+    public CreateContainerCmd withDevices(Device... devices);
+
+    public CreateContainerCmd withNetworkDisabled(boolean disableNetwork);
+
+    /**
+     * Set custom DNS servers
+     */
+    public CreateContainerCmd withDns(String... dns);
+
+    /**
+     * Set custom DNS search domains
+     */
+    public CreateContainerCmd withDnsSearch(String... dnsSearch);
+
+    public CreateContainerCmd withEntrypoint(String... entrypoint);
+
+    public CreateContainerCmd withEnv(String... env);
+
+    public CreateContainerCmd withExposedPorts(ExposedPort... exposedPorts);
+
+    /**
+     * Add hostnames to /etc/hosts in the container
+     */
+    public CreateContainerCmd withExtraHosts(String... extraHosts);
+
+    public CreateContainerCmd withHostConfig(HostConfig hostConfig);
+
+    public CreateContainerCmd withHostName(String hostName);
+
+    public CreateContainerCmd withDomainName(String domainName);
+
+    public CreateContainerCmd withImage(String image);
+
+    /**
+     * Add link to another container.
+     */
+    public CreateContainerCmd withLinks(Link... links);
+
+    public CreateContainerCmd withLxcConf(LxcConf... lxcConf);
+
+    public CreateContainerCmd withMemoryLimit(long memoryLimit);
+
+    public CreateContainerCmd withMemorySwap(long memorySwap);
+
+    public CreateContainerCmd withName(String name);
+
+    /**
+     * Set the Network mode for the container
+     * <ul>
+     * <li>'bridge': creates a new network stack for the container on the docker bridge</li>
+     * <li>'none': no networking for this container</li>
+     * <li>'container:<name|id>': reuses another container network stack</li>
+     * <li>'host': use the host network stack inside the container. Note: the host mode gives the container full access
+     * to local system services such as D-bus and is therefore considered insecure.</li>
+     * </ul>
+     */
+    public CreateContainerCmd withNetworkMode(String networkMode);
+
+    /**
+     * Add one or more {@link PortBinding}s. This corresponds to the <code>--publish</code> (<code>-p</code>) option of
+     * the <code>docker run</code> CLI command.
+     */
+    public CreateContainerCmd withPortBindings(PortBinding... portBindings);
+
+    /**
+     * Add the port bindings that are contained in the given {@link Ports} object.
+     *
+     * @see #withPortBindings(PortBinding...)
+     */
+    public CreateContainerCmd withPortBindings(Ports portBindings);
+
+    public CreateContainerCmd withPortSpecs(String... portSpecs);
+
+    public CreateContainerCmd withPrivileged(boolean privileged);
+
+    public CreateContainerCmd withPublishAllPorts(boolean publishAllPorts);
+
+    /**
+     * Set custom {@link RestartPolicy} for the container. Defaults to {@link RestartPolicy#noRestart()}
+     */
+    public CreateContainerCmd withRestartPolicy(RestartPolicy restartPolicy);
+
+    public CreateContainerCmd withStdInOnce(boolean stdInOnce);
+
+    public CreateContainerCmd withStdinOpen(boolean stdinOpen);
+
+    public CreateContainerCmd withTty(boolean tty);
+
+    public CreateContainerCmd withUser(String user);
+
+    public CreateContainerCmd withVolumes(Volume... volumes);
+
+    public CreateContainerCmd withVolumesFrom(VolumesFrom... volumesFrom);
+
+    public CreateContainerCmd withWorkingDir(String workingDir);
+
+    public CreateContainerCmd withMacAddress(String macAddress);
 
 }
diff --git a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
index 18b089d4d..cc082b61f 100644
--- a/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
+++ b/src/main/java/com/github/dockerjava/core/command/CreateContainerCmdImpl.java
@@ -26,542 +26,575 @@
 import com.github.dockerjava.api.model.Volumes;
 
 /**
- * 
+ *
  * Creates a new container.
- * 
+ *
  */
-public class CreateContainerCmdImpl extends
-		AbstrDockerCmd<CreateContainerCmd, CreateContainerResponse> implements
-		CreateContainerCmd {
-
-	private String name;
-
-	@JsonProperty("Hostname")
-	private String hostName = "";
-	@JsonProperty("User")
-	private String user = "";
-	@JsonProperty("Memory")
-	private long memoryLimit = 0;
-	@JsonProperty("MemorySwap")
-	private long memorySwap = 0;
-	@JsonProperty("CpuShares")
-	private int cpuShares = 0;
-	@JsonProperty("Cpuset")
-	private String cpuset;
-	@JsonProperty("AttachStdin")
-	private boolean attachStdin = false;
-	@JsonProperty("AttachStdout")
-	private boolean attachStdout = false;
-	@JsonProperty("AttachStderr")
-	private boolean attachStderr = false;
-	@JsonProperty("PortSpecs")
-	private String[] portSpecs;
-	@JsonProperty("Tty")
-	private boolean tty = false;
-	@JsonProperty("OpenStdin")
-	private boolean stdinOpen = false;
-	@JsonProperty("StdinOnce")
-	private boolean stdInOnce = false;
-	@JsonProperty("Env")
-	private String[] env;
-	@JsonProperty("Cmd")
-	private String[] cmd;
-	@JsonProperty("Entrypoint")
-	private String[] entrypoint;
-	@JsonProperty("Image")
-	private String image;
-	@JsonProperty("Volumes")
-	private Volumes volumes = new Volumes();
-	@JsonProperty("WorkingDir")
-	private String workingDir = "";
-	@JsonProperty("MacAddress")
-	private String macAddress;
-	@JsonProperty("NetworkDisabled")
-	private boolean networkDisabled = false;
-	@JsonProperty("ExposedPorts")
-	private ExposedPorts exposedPorts = new ExposedPorts();
-	@JsonProperty("HostConfig")
-	private HostConfig hostConfig = new HostConfig();
-
-	public CreateContainerCmdImpl(CreateContainerCmd.Exec exec, String image) {
-		super(exec);
-		checkNotNull(image, "image was not specified");
-		withImage(image);
-	}
-
-	/**
-	 * @throws NotFoundException
-	 *             No such container
-	 * @throws ConflictException
-	 *             Named container already exists
-	 */
-	@Override
-	public CreateContainerResponse exec() throws NotFoundException,
-			ConflictException {
-		return super.exec();
-	}
-
-	@Override
-	@JsonIgnore
-	public Bind[] getBinds() {
-		return hostConfig.getBinds();
-	}
-
-	@Override
-	public Capability[] getCapAdd() {
-		return hostConfig.getCapAdd();
-	}
-
-	@Override
-	public Capability[] getCapDrop() {
-		return hostConfig.getCapDrop();
-	}
-
-	@Override
-	public String[] getCmd() {
-		return cmd;
-	}
-
-	@Override
-	public String getCpuset() {
-		return cpuset;
-	}
-
-	@Override
-	public int getCpuShares() {
-		return cpuShares;
-	}
-
-	@Override
-	@JsonIgnore
-	public Device[] getDevices() {
-		return hostConfig.getDevices();
-	}
-
-	@Override
-	@JsonIgnore
-	public String[] getDns() {
-		return hostConfig.getDns();
-	}
-
-	@Override
-	@JsonIgnore
-	public String[] getDnsSearch() {
-		return hostConfig.getDnsSearch();
-	}
-
-	@Override
-	public String[] getEntrypoint() {
-		return entrypoint;
-	}
-
-	@Override
-	public String[] getEnv() {
-		return env;
-	}
-
-	@Override
-	@JsonIgnore
-	public ExposedPort[] getExposedPorts() {
-		return exposedPorts.getExposedPorts();
-	}
-
-	@Override
-	@JsonIgnore
-	public String[] getExtraHosts() {
-		return hostConfig.getExtraHosts();
-	}
-
-	@Override
-	public HostConfig getHostConfig() {
-		return hostConfig;
-	}
-
-	@Override
-	public String getHostName() {
-		return hostName;
-	}
-
-	@Override
-	public String getImage() {
-		return image;
-	}
-
-	@Override
-	@JsonIgnore
-	public Link[] getLinks() {
-		return hostConfig.getLinks();
-	}
-
-	@Override
-	@JsonIgnore
-	public LxcConf[] getLxcConf() {
-		return hostConfig.getLxcConf();
-	}
-	
-	public String getMacAddress() {
-		return macAddress;
-	}
-
-	@Override
-	public long getMemoryLimit() {
-		return memoryLimit;
-	}
-
-	@Override
-	public long getMemorySwap() {
-		return memorySwap;
-	}
-
-	@Override
-	public String getName() {
-		return name;
-	}
-
-	@Override
-	@JsonIgnore
-	public String getNetworkMode() {
-		return hostConfig.getNetworkMode();
-	}
-
-	@Override
-	@JsonIgnore
-	public Ports getPortBindings() {
-		return hostConfig.getPortBindings();
-	}
-
-	@Override
-	public String[] getPortSpecs() {
-		return portSpecs;
-	}
-
-	@Override
-	@JsonIgnore
-	public RestartPolicy getRestartPolicy() {
-		return hostConfig.getRestartPolicy();
-	}
-
-	@Override
-	public String getUser() {
-		return user;
-	}
-
-	@Override
-	@JsonIgnore
-	public Volume[] getVolumes() {
-		return volumes.getVolumes();
-	}
-
-	@Override
-	@JsonIgnore
-	public VolumesFrom[] getVolumesFrom() {
-		return hostConfig.getVolumesFrom();
-	}
-
-	@Override
-	public String getWorkingDir() {
-		return workingDir;
-	}
-
-	@Override
-	public boolean isAttachStderr() {
-		return attachStderr;
-	}
-
-	@Override
-	public boolean isAttachStdin() {
-		return attachStdin;
-	}
-
-	@Override
-	public boolean isAttachStdout() {
-		return attachStdout;
-	}
-
-	@Override
-	public boolean isNetworkDisabled() {
-		return networkDisabled;
-	}
-
-	@Override
-	@JsonIgnore
-	public Boolean isPrivileged() {
-		return hostConfig.isPrivileged();
-	}
-
-	@Override
-	@JsonIgnore
-	public Boolean isPublishAllPorts() {
-		return hostConfig.isPublishAllPorts();
-	}
-
-	@Override
-	public boolean isStdInOnce() {
-		return stdInOnce;
-	}
-
-	@Override
-	public boolean isStdinOpen() {
-		return stdinOpen;
-	}
-
-	@Override
-	public boolean isTty() {
-		return tty;
-	}
-
-	@Override
-	public String toString() {
-		return new ToStringBuilder(this).append("create container ")
-				.append(name != null ? "name=" + name + " " : "").append(this)
-				.toString();
-	}
-
-	@Override
-	public CreateContainerCmdImpl withAttachStderr(boolean attachStderr) {
-		this.attachStderr = attachStderr;
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmdImpl withAttachStdin(boolean attachStdin) {
-		this.attachStdin = attachStdin;
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmdImpl withAttachStdout(boolean attachStdout) {
-		this.attachStdout = attachStdout;
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmd withBinds(Bind... binds) {
-		hostConfig.setBinds(binds);
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmd withCapAdd(Capability... capAdd) {
-		hostConfig.setCapAdd(capAdd);
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmd withCapDrop(Capability... capDrop) {
-		hostConfig.setCapDrop(capDrop);
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmdImpl withCmd(String... cmd) {
-		this.cmd = cmd;
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmdImpl withCpuset(String cpuset) {
-		this.cpuset = cpuset;
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmdImpl withCpuShares(int cpuShares) {
-		this.cpuShares = cpuShares;
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmd withDevices(Device... devices) {
-		this.hostConfig.setDevices(devices);
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmdImpl withNetworkDisabled(boolean disableNetwork) {
-		this.networkDisabled = disableNetwork;
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmdImpl withDns(String... dns) {
-		this.hostConfig.setDns(dns);
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmd withDnsSearch(String... dnsSearch) {
-		this.hostConfig.setDnsSearch(dnsSearch);
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmdImpl withEntrypoint(String... entrypoint) {
-		this.entrypoint = entrypoint;
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmdImpl withEnv(String... env) {
-		this.env = env;
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmdImpl withExposedPorts(ExposedPort... exposedPorts) {
-		this.exposedPorts = new ExposedPorts(exposedPorts);
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmd withExtraHosts(String... extraHosts) {
-		this.hostConfig.setExtraHosts(extraHosts);
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmd withHostConfig(HostConfig hostConfig) {
-		checkNotNull(hostConfig, "no host config was specified");
-		this.hostConfig = hostConfig;
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmdImpl withHostName(String hostName) {
-		this.hostName = hostName;
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmdImpl withImage(String image) {
-		this.image = image;
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmdImpl withLinks(Link... links) {
-		checkNotNull(links, "links was not specified");
-		this.hostConfig.setLinks(links);
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmd withLxcConf(LxcConf... lxcConf) {
-		checkNotNull(lxcConf, "lxcConf was not specified");
-		this.hostConfig.setLxcConf(lxcConf);
-		return this;
-	}
-	
-	@Override
-	public CreateContainerCmdImpl withMacAddress(String macAddress) {
-		this.macAddress = macAddress;
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmdImpl withMemoryLimit(long memoryLimit) {
-		this.memoryLimit = memoryLimit;
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmdImpl withMemorySwap(long memorySwap) {
-		this.memorySwap = memorySwap;
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmdImpl withName(String name) {
-		checkNotNull(name, "name was not specified");
-		this.name = name;
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmd withNetworkMode(String networkMode) {
-		checkNotNull(networkMode, "networkMode was not specified");
-		this.hostConfig.setNetworkMode(networkMode);
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmd withPortBindings(PortBinding... portBindings) {
-		checkNotNull(portBindings, "portBindings was not specified");
-		this.hostConfig.setPortBindings(new Ports(portBindings));
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmd withPortBindings(Ports portBindings) {
-		checkNotNull(portBindings, "portBindings was not specified");
-		this.hostConfig.setPortBindings(portBindings);
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmdImpl withPortSpecs(String... portSpecs) {
-		this.portSpecs = portSpecs;
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmd withPrivileged(boolean privileged) {
-		this.hostConfig.setPrivileged(privileged);
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmd withPublishAllPorts(boolean publishAllPorts) {
-		this.hostConfig.setPublishAllPorts(publishAllPorts);
-		return this;
-	}
-	
-	@Override
-	public CreateContainerCmd withRestartPolicy(RestartPolicy restartPolicy) {
-		this.hostConfig.setRestartPolicy(restartPolicy);
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmdImpl withStdInOnce(boolean stdInOnce) {
-		this.stdInOnce = stdInOnce;
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmdImpl withStdinOpen(boolean stdinOpen) {
-		this.stdinOpen = stdinOpen;
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmdImpl withTty(boolean tty) {
-		this.tty = tty;
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmdImpl withUser(String user) {
-		this.user = user;
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmdImpl withVolumes(Volume... volumes) {
-		this.volumes = new Volumes(volumes);
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmdImpl withVolumesFrom(VolumesFrom... volumesFrom) {
-		this.hostConfig.setVolumesFrom(volumesFrom);
-		return this;
-	}
-
-	@Override
-	public CreateContainerCmdImpl withWorkingDir(String workingDir) {
-		this.workingDir = workingDir;
-		return this;
-	}
+public class CreateContainerCmdImpl extends AbstrDockerCmd<CreateContainerCmd, CreateContainerResponse> implements
+        CreateContainerCmd {
+
+    private String name;
+
+    @JsonProperty("Hostname")
+    private String hostName = "";
+
+    @JsonProperty("Domainname")
+    private String domainName = "";
+
+    @JsonProperty("User")
+    private String user = "";
+
+    @JsonProperty("Memory")
+    private long memoryLimit = 0;
+
+    @JsonProperty("MemorySwap")
+    private long memorySwap = 0;
+
+    @JsonProperty("CpuShares")
+    private int cpuShares = 0;
+
+    @JsonProperty("Cpuset")
+    private String cpuset;
+
+    @JsonProperty("AttachStdin")
+    private boolean attachStdin = false;
+
+    @JsonProperty("AttachStdout")
+    private boolean attachStdout = false;
+
+    @JsonProperty("AttachStderr")
+    private boolean attachStderr = false;
+
+    @JsonProperty("PortSpecs")
+    private String[] portSpecs;
+
+    @JsonProperty("Tty")
+    private boolean tty = false;
+
+    @JsonProperty("OpenStdin")
+    private boolean stdinOpen = false;
+
+    @JsonProperty("StdinOnce")
+    private boolean stdInOnce = false;
+
+    @JsonProperty("Env")
+    private String[] env;
+
+    @JsonProperty("Cmd")
+    private String[] cmd;
+
+    @JsonProperty("Entrypoint")
+    private String[] entrypoint;
+
+    @JsonProperty("Image")
+    private String image;
+
+    @JsonProperty("Volumes")
+    private Volumes volumes = new Volumes();
+
+    @JsonProperty("WorkingDir")
+    private String workingDir = "";
+
+    @JsonProperty("MacAddress")
+    private String macAddress;
+
+    @JsonProperty("NetworkDisabled")
+    private boolean networkDisabled = false;
+
+    @JsonProperty("ExposedPorts")
+    private ExposedPorts exposedPorts = new ExposedPorts();
+
+    @JsonProperty("HostConfig")
+    private HostConfig hostConfig = new HostConfig();
+
+    public CreateContainerCmdImpl(CreateContainerCmd.Exec exec, String image) {
+        super(exec);
+        checkNotNull(image, "image was not specified");
+        withImage(image);
+    }
+
+    /**
+     * @throws NotFoundException
+     *             No such container
+     * @throws ConflictException
+     *             Named container already exists
+     */
+    @Override
+    public CreateContainerResponse exec() throws NotFoundException, ConflictException {
+        return super.exec();
+    }
+
+    @Override
+    @JsonIgnore
+    public Bind[] getBinds() {
+        return hostConfig.getBinds();
+    }
+
+    @Override
+    public Capability[] getCapAdd() {
+        return hostConfig.getCapAdd();
+    }
+
+    @Override
+    public Capability[] getCapDrop() {
+        return hostConfig.getCapDrop();
+    }
+
+    @Override
+    public String[] getCmd() {
+        return cmd;
+    }
+
+    @Override
+    public String getCpuset() {
+        return cpuset;
+    }
+
+    @Override
+    public int getCpuShares() {
+        return cpuShares;
+    }
+
+    @Override
+    @JsonIgnore
+    public Device[] getDevices() {
+        return hostConfig.getDevices();
+    }
+
+    @Override
+    @JsonIgnore
+    public String[] getDns() {
+        return hostConfig.getDns();
+    }
+
+    @Override
+    @JsonIgnore
+    public String[] getDnsSearch() {
+        return hostConfig.getDnsSearch();
+    }
+
+    @Override
+    public String[] getEntrypoint() {
+        return entrypoint;
+    }
+
+    @Override
+    public String[] getEnv() {
+        return env;
+    }
+
+    @Override
+    @JsonIgnore
+    public ExposedPort[] getExposedPorts() {
+        return exposedPorts.getExposedPorts();
+    }
+
+    @Override
+    @JsonIgnore
+    public String[] getExtraHosts() {
+        return hostConfig.getExtraHosts();
+    }
+
+    @Override
+    public HostConfig getHostConfig() {
+        return hostConfig;
+    }
+
+    @Override
+    public String getHostName() {
+        return hostName;
+    }
+
+    @Override
+    public String getDomainName() {
+        return domainName;
+    }
+
+    @Override
+    public String getImage() {
+        return image;
+    }
+
+    @Override
+    @JsonIgnore
+    public Link[] getLinks() {
+        return hostConfig.getLinks();
+    }
+
+    @Override
+    @JsonIgnore
+    public LxcConf[] getLxcConf() {
+        return hostConfig.getLxcConf();
+    }
+
+    public String getMacAddress() {
+        return macAddress;
+    }
+
+    @Override
+    public long getMemoryLimit() {
+        return memoryLimit;
+    }
+
+    @Override
+    public long getMemorySwap() {
+        return memorySwap;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    @JsonIgnore
+    public String getNetworkMode() {
+        return hostConfig.getNetworkMode();
+    }
+
+    @Override
+    @JsonIgnore
+    public Ports getPortBindings() {
+        return hostConfig.getPortBindings();
+    }
+
+    @Override
+    public String[] getPortSpecs() {
+        return portSpecs;
+    }
+
+    @Override
+    @JsonIgnore
+    public RestartPolicy getRestartPolicy() {
+        return hostConfig.getRestartPolicy();
+    }
+
+    @Override
+    public String getUser() {
+        return user;
+    }
+
+    @Override
+    @JsonIgnore
+    public Volume[] getVolumes() {
+        return volumes.getVolumes();
+    }
+
+    @Override
+    @JsonIgnore
+    public VolumesFrom[] getVolumesFrom() {
+        return hostConfig.getVolumesFrom();
+    }
+
+    @Override
+    public String getWorkingDir() {
+        return workingDir;
+    }
+
+    @Override
+    public boolean isAttachStderr() {
+        return attachStderr;
+    }
+
+    @Override
+    public boolean isAttachStdin() {
+        return attachStdin;
+    }
+
+    @Override
+    public boolean isAttachStdout() {
+        return attachStdout;
+    }
+
+    @Override
+    public boolean isNetworkDisabled() {
+        return networkDisabled;
+    }
+
+    @Override
+    @JsonIgnore
+    public Boolean isPrivileged() {
+        return hostConfig.isPrivileged();
+    }
+
+    @Override
+    @JsonIgnore
+    public Boolean isPublishAllPorts() {
+        return hostConfig.isPublishAllPorts();
+    }
+
+    @Override
+    public boolean isStdInOnce() {
+        return stdInOnce;
+    }
+
+    @Override
+    public boolean isStdinOpen() {
+        return stdinOpen;
+    }
+
+    @Override
+    public boolean isTty() {
+        return tty;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this).append("create container ").append(name != null ? "name=" + name + " " : "")
+                .append(this).toString();
+    }
+
+    @Override
+    public CreateContainerCmdImpl withAttachStderr(boolean attachStderr) {
+        this.attachStderr = attachStderr;
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmdImpl withAttachStdin(boolean attachStdin) {
+        this.attachStdin = attachStdin;
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmdImpl withAttachStdout(boolean attachStdout) {
+        this.attachStdout = attachStdout;
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmd withBinds(Bind... binds) {
+        hostConfig.setBinds(binds);
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmd withCapAdd(Capability... capAdd) {
+        hostConfig.setCapAdd(capAdd);
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmd withCapDrop(Capability... capDrop) {
+        hostConfig.setCapDrop(capDrop);
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmdImpl withCmd(String... cmd) {
+        this.cmd = cmd;
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmdImpl withCpuset(String cpuset) {
+        this.cpuset = cpuset;
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmdImpl withCpuShares(int cpuShares) {
+        this.cpuShares = cpuShares;
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmd withDevices(Device... devices) {
+        this.hostConfig.setDevices(devices);
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmdImpl withNetworkDisabled(boolean disableNetwork) {
+        this.networkDisabled = disableNetwork;
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmdImpl withDns(String... dns) {
+        this.hostConfig.setDns(dns);
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmd withDnsSearch(String... dnsSearch) {
+        this.hostConfig.setDnsSearch(dnsSearch);
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmdImpl withEntrypoint(String... entrypoint) {
+        this.entrypoint = entrypoint;
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmdImpl withEnv(String... env) {
+        this.env = env;
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmdImpl withExposedPorts(ExposedPort... exposedPorts) {
+        this.exposedPorts = new ExposedPorts(exposedPorts);
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmd withExtraHosts(String... extraHosts) {
+        this.hostConfig.setExtraHosts(extraHosts);
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmd withHostConfig(HostConfig hostConfig) {
+        checkNotNull(hostConfig, "no host config was specified");
+        this.hostConfig = hostConfig;
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmdImpl withHostName(String hostName) {
+        this.hostName = hostName;
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmdImpl withDomainName(String domainName) {
+        this.domainName = domainName;
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmdImpl withImage(String image) {
+        this.image = image;
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmdImpl withLinks(Link... links) {
+        checkNotNull(links, "links was not specified");
+        this.hostConfig.setLinks(links);
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmd withLxcConf(LxcConf... lxcConf) {
+        checkNotNull(lxcConf, "lxcConf was not specified");
+        this.hostConfig.setLxcConf(lxcConf);
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmdImpl withMacAddress(String macAddress) {
+        this.macAddress = macAddress;
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmdImpl withMemoryLimit(long memoryLimit) {
+        this.memoryLimit = memoryLimit;
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmdImpl withMemorySwap(long memorySwap) {
+        this.memorySwap = memorySwap;
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmdImpl withName(String name) {
+        checkNotNull(name, "name was not specified");
+        this.name = name;
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmd withNetworkMode(String networkMode) {
+        checkNotNull(networkMode, "networkMode was not specified");
+        this.hostConfig.setNetworkMode(networkMode);
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmd withPortBindings(PortBinding... portBindings) {
+        checkNotNull(portBindings, "portBindings was not specified");
+        this.hostConfig.setPortBindings(new Ports(portBindings));
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmd withPortBindings(Ports portBindings) {
+        checkNotNull(portBindings, "portBindings was not specified");
+        this.hostConfig.setPortBindings(portBindings);
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmdImpl withPortSpecs(String... portSpecs) {
+        this.portSpecs = portSpecs;
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmd withPrivileged(boolean privileged) {
+        this.hostConfig.setPrivileged(privileged);
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmd withPublishAllPorts(boolean publishAllPorts) {
+        this.hostConfig.setPublishAllPorts(publishAllPorts);
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmd withRestartPolicy(RestartPolicy restartPolicy) {
+        this.hostConfig.setRestartPolicy(restartPolicy);
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmdImpl withStdInOnce(boolean stdInOnce) {
+        this.stdInOnce = stdInOnce;
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmdImpl withStdinOpen(boolean stdinOpen) {
+        this.stdinOpen = stdinOpen;
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmdImpl withTty(boolean tty) {
+        this.tty = tty;
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmdImpl withUser(String user) {
+        this.user = user;
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmdImpl withVolumes(Volume... volumes) {
+        this.volumes = new Volumes(volumes);
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmdImpl withVolumesFrom(VolumesFrom... volumesFrom) {
+        this.hostConfig.setVolumesFrom(volumesFrom);
+        return this;
+    }
+
+    @Override
+    public CreateContainerCmdImpl withWorkingDir(String workingDir) {
+        this.workingDir = workingDir;
+        return this;
+    }
 
 }