Changes on mappings chargements