Refactor property injector into its own class