Mapped the User model to the db more accurately