Add missing Mapping protocol methods
Change model comparison
Small refactor to group Mapping methods
Merge branch 'nKey-model-mapping' into development