Updated mapping classes