Updated to work with the model specified in auth configuration file.
Merge branch 'master' of https://github.com/AnasT/Caracal
Remove unnecessary uses.