Finish adding user model portions