changed the key and the type name of ColumnDefValueMap to ItemId and ItemIdValueMap respectively.