Container builder refactoring