Added more Pmp mapper implementation