removed user model and added user extension