Migrate to Unified API