Various changes to User and new data models.