A better mapping file