More work switching to shared auth and refdata classes