Added mapping for openpm
Improved the way the mapping was calculated
Commented a part of the extracted model which should not be part of the model