Temporarily removed DCKeyValueObjectMapping dependency