Fixed compile error
Refactored more services to use constructor injection