Fix of the issue in Auth module and more structured rum