Next: add upsert validation