Added stuff for auth