Refactoring - usage of container builder