Update RelationFinder according to the new Field API