Further changes to support IInjectionKernel