Updated datamodel to post-DSTU