ParameterInjector Refactoring