Get rid of Data record in model, since we do not yet have record primitives.
Support dashes in variable names