Authorization. Architecture changes
Merge conflict1
Merge conflict 3