Updated users controller and model to use new Model format.