Index: trunk/ippTools/src/regtool.c
===================================================================
--- trunk/ippTools/src/regtool.c	(revision 12232)
+++ trunk/ippTools/src/regtool.c	(revision 12259)
@@ -203,18 +203,5 @@
             }
         }
-        psString class = psMetadataLookupStr(&status, config->args, "-class");
-        if (!status) {
-            psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -class");
-            psFree(query);
-            return false;
-        }
-        if (class) {
-            if (!psMetadataAddStr(where, PS_LIST_TAIL, "class", 0, "==", class)) {
-                psError(PS_ERR_UNKNOWN, false, "failed to add item class");
-                psFree(where);
-                psFree(query);
-                return false;
-            }
-        }
+
         psString class_id = psMetadataLookupStr(&status, config->args, "-class_id");
         if (!status) {
@@ -855,4 +842,14 @@
     }
 
+    psString filelevel = psMetadataLookupStr(&status, config->args, "-filelevel");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -filelevel");
+        return false;
+    }
+    if (!filelevel) {
+        psError(PS_ERR_UNKNOWN, true, "-filelevel is required");
+        return false;
+    }
+
     psString filter = psMetadataLookupStr(&status, config->args, "-filter");
     if (!status) {
@@ -932,4 +929,5 @@
         return false;
     }
+
     psTime *dateobs = NULL;
     {
@@ -962,4 +960,5 @@
         exp_type,
         exp->imfiles,
+        filelevel,
         exp->workdir,
         filter,
@@ -1102,5 +1101,4 @@
     rawImfileRow *raw = rawImfileRowAlloc(
         imfile->exp_tag,
-        imfile->class,
         imfile->class_id,
         imfile->uri,