Migrating to v2 - Supabase