Container: refactoring