Updated mapping functions