Changed handling of authorization tokens