Issue #1: Initial version
Refactored the code to take into account the new structure of the authorization module