Adding objectdefs, more gizmo support