Updated services to match changes in trident repo.