added gizmo data structure support