Initial map & structure commit