Container behavior refactoring