basic map functions restored