Also a bulk upsert would be nice