Refactoring to enable authentication handling
Implementing authentication and authorization the OLS way ;)