Finish revise user model