RFT: Refactored some classes to use extabase DI