Removed the need for Map, addresed review