- improved authorization key handling