Basic upsert support