NXP-11505: Improve Class mapper in XMAP to manage Array