container aware
adding the missing ContainerAware