To accommodate the upcoming schema change to auth object...