Added support for CompositePath & ClosedPath shape