Added datamodel classes.