Models namespace
Expired token fix
Auth fixes