First work on map storage