Comment this out for now until we redo it
EntryDataModel improvement