Add missing Mapping protocol methods
Change model comparison
Small refactor to group Mapping methods