ADD: datamodel stuff for serialization improvement