Change classes with parameter property to use inject()

Change classes with parameter property to use inject() #510