Promoting duplicate logic up to DataDefinition
AddinSetting PredicateSet as a DataDefition