Added Polygon annotations and JSON support