Added map and data exports