Made ContainerAware work