Updating to support the type of geometry moving from annotation to the geometry itself.