Updated mapping