Merge.
Small refactor to group Mapping methods
Change model comparison