Refactoring of containers