More custom auth model work