internal refactoring in property injection api