Minor modifications to service