Created ContainerInterface
Refactoring