Added ContainerAwareTrait