This MR is meant to update the decorator to be able to read the new mapping format. Similar to the efex format.