Updated mapping demo