adding the missing ContainerAware