Finish some ServiceDelegate functionality