Made geometry instance-friendly