PIM-1776 Initial restructuration of mapping