Refactor to so we can also use target mapping on Auth mechanisms