Refactorings no build_container