More upsert work