Refactoring MapPoint

Refactoring MapPoint