ET-1302 : aspect now works on an injected interface, not on Entity, so
SearchCriteria doesn't need to extend Entity.