Refactored Authorization