Extracted the container building to a separate class
Merge pull request #465 from stof/extract_container_creation

Extracted the container building to a separate class