diff --git a/lib/metadata/fieldset.inc.php b/lib/metadata/fieldset.inc.php
index d95ba62..252e8b1 100644
--- a/lib/metadata/fieldset.inc.php
+++ b/lib/metadata/fieldset.inc.php
@@ -17,11 +17,15 @@ class KTFieldset extends KTEntity {
 	/** document fieldset namespace */
 	var $sNamespace;
 	/** document fieldset mandatory flag*/
-	var $bMandatory;
-	var $bIsConditional;
+	var $bMandatory = false;
+	var $bIsConditional = false;
 	var $iMasterFieldId;
 
-    var $bIsGeneric;
+    var $bIsGeneric = false;
+    // By default, we're complete.  When we become conditional, then we
+    // become incomplete until made complete.
+    var $bIsComplete = true;
+    var $bIsComplex = false;
 	
     var $_bUsePearError = true;
 	
@@ -39,6 +43,10 @@ class KTFieldset extends KTEntity {
 	function setMasterFieldId ($iNewValue) {	$this->iMasterFieldId = $iNewValue; }	
 	function getIsGeneric () { return $this->bIsGeneric; }
 	function setIsGeneric ($bNewValue) {	$this->bIsGeneric = $bNewValue; }	
+	function getIsComplete () { return $this->bIsComplete; }
+	function setIsComplete ($bNewValue) {	$this->bIsComplete = $bNewValue; }	
+	function getIsComplex () { return $this->bIsComplex; }
+	function setIsComplex ($bNewValue) {	$this->bIsComplex = $bNewValue; }	
 
     var $_aFieldToSelect = array(
         "iId" => "id",
@@ -48,6 +56,8 @@ class KTFieldset extends KTEntity {
 		"bIsConditional" => "is_conditional",
 		"iMasterFieldId" => "master_field",
         "bIsGeneric" => "is_generic",
+        "bIsComplete" => "is_complete",
+        "bIsComplex" => "is_complex",
     );
 	
 	// returns TRUE if all children are lookup enabled, false otherwise.
@@ -109,6 +119,12 @@ class KTFieldset extends KTEntity {
     function &getFields() {
         return DocumentField::getByFieldset($this);
     }
+
+    function &getByField($oField) {
+        $oField =& KTUtil::getObject('DocumentField', $oField);
+        $iFieldsetId = $oField->getParentFieldsetId();
+        return KTFieldset::get($iFieldsetId);
+    }
 }
 
 ?>