Modified User model for new database