DM 1.0 compat: do not add claims to properties and add statements to items

Change-Id: Ida353b008494fe5fa69c5a1bc3c87e1bb2101f2d