minor changes in mapping files for simplicity