Refactored to use GeometryType instead of BlobType.