Initial work to make ORM driver for Auth compatible with input tokens