Improved ServiceController.