Updated mapping function.