Updated to use the new model classes.