Added rudimentary support for polyline, polygon, and single point annotations.