Added more outputs for update/upsert