Updated mapping files