Added full convex/concave polygon support