Fixed `ContainerAwareTrait` class