Updated auth with new mappings