Feature/auth upgrades