Container refactoring.