Refactor user models.