Backport of new data model / form structure.