Added settings and auth