Update for newer services