Add ability to void xrays and change concept references to be by mappings rather than concept names