Added comments, MapHandler