added all map functionalities of v1 to v2