Fixed mapping files