Migrated services to the new standard