It seems that you don't need `ContainerAware` any more :wink: