First sketch of new MapData organization