Updated with latest mapping data