Refactor Auth, Mapfactory