Added mapping and XSAPR