Refactored Authorization
Extending authorization logic