Added 'map' to rich data table