Work on the data definition classes in the Model Package for now