Migrated HandlingRotation to unified api