Removed use of MapPointBuilder