Merged mapping with refactor