Mapping and Exclusion now are interfaces