Refactoring for same container problem.