Added ContainerAwareInterface