Updated user model and tables