Added in handling for services