Adapt to changes in DataTypes 0.3

Change-Id: Ie0b40e317202e19f7f9941fc4d2b09452c5257bf