Splitting up Finding and Relation Mapping