Change Container to ContainerInterface