Added support for 0.1.7 with closed shapes and start