Updated for API changes with UpdateService