ISSUE: Some changes to Authorization