Migrating new classes to failover rest calls