Fixing lack of ORM inheritance for upstream Auth