Adapted to changes in Service module