Added InjectorAware and InjectorAwareTrait