Fixed user model
Added token