With auth changes

Merged ferencmarkizay requested to merge feature/with-auth-feri into feature/with-auth Mar 23, 2020