Bring datamodel to 0.4.0