DepartmentService refactor