Changed samples to use MapPoints instead of MapPointBuilder