Switch to factory syntax for services, as the API becomes more clear