changes in user model, add scope