Mapping refactor fix

@WouterJ this fixed the extend problem