Adding new Map visitor

Close #5