User model and controller added again