close #3 - refactor Parse and NewMapHandler function