Mapping updated

Last changes are proposed!