map functionality added