Init #28 - Move service to a factory