Added new model classes and parser helper classes.