Migrated Controls to unified api