Work on datamodel.