InjectionAwareInterface restructure