Yi - move InjectionContext to the core package