Updated mapping etc.