add: create maps more properly