Updated pattern matching for migrateKVPs