Update to MapHelper Functions