Some changes for the new auth