additional changes in mappings