Update for services API changes