First work on refactoring container