Refactored dependency injection to use more appropriate services, specifically replacing direct service calls with class properties.
Closes #3458110