Datamodel added as utility and file io classes added