Modify User model and User spec