Container Refactoring