further changes to the mappers and the scripts