Refactored more services to use constructor injection