Added ContainerAwareInterface

this should be a Trait?