More optimizations to upsert