Container refactoring