Use DataModel 1.0

Change-Id: I1ec5ac5c8f7b4a6793edd058882685ad0818d26d