Add method buildContainer
Add use of Helpers
Add docs, refactoring