Improvements to Authorization Service