Added data-value objects for in- and exclude definitions