Included further support for GeometryCollections