No more passport, better database upserts