DockerAPIClient refactored