diff --git a/include/odm.h b/include/odm.h
index 2a3d75b..0d6c801 100644
--- a/include/odm.h
+++ b/include/odm.h
@@ -7,14 +7,27 @@
 
 using michlib::errmessage;
 
-template<class T, ActionID id> consteval bool MustSupported()
+template<class T, ActionID id> consteval bool MustSup()
 {
  static_assert(IsActionSupported<T, id>);
  return true;
 };
 
-constexpr bool supported = MustSupported<NEMOData, ActionID::INFO>() && MustSupported<NEMOData, ActionID::TSC>() && MustSupported<NEMOData, ActionID::UV>() &&
-                           MustSupported<HYCOMData, ActionID::INFO>() && MustSupported<HYCOMData, ActionID::TSC>() && MustSupported<HYCOMData, ActionID::UV>() &&
-                           MustSupported<AVISOData, ActionID::INFO>() && MustSupported<AVISOData, ActionID::TSC>() && MustSupported<AVISOData, ActionID::UV>() &&
-                           MustSupported<AVISOLOCALData, ActionID::INFO>() && MustSupported<AVISOLOCALData, ActionID::TSC>() && MustSupported<AVISOLOCALData, ActionID::UV>() &&
-                           MustSupported<BINFILEData, ActionID::INFO>() && MustSupported<BINFILEData, ActionID::TSC>() && MustSupported<BINFILEData, ActionID::UV>();
+constexpr bool NEMOsup =
+    MustSup<NEMOData, ActionID::INFO>() && MustSup<NEMOData, ActionID::TSC>() && MustSup<NEMOData, ActionID::UV>() && MustSup<NEMOData, ActionID::GENINTFILE>();
+
+constexpr bool HYCOMsup =
+    MustSup<HYCOMData, ActionID::INFO>() && MustSup<HYCOMData, ActionID::TSC>() && MustSup<HYCOMData, ActionID::UV>() && MustSup<HYCOMData, ActionID::GENINTFILE>();
+
+constexpr bool AVISOsup =
+    MustSup<AVISOData, ActionID::INFO>() && MustSup<AVISOData, ActionID::TSC>() && MustSup<AVISOData, ActionID::UV>() && MustSup<AVISOData, ActionID::GENINTFILE>();
+
+constexpr bool AVISOLsup = MustSup<AVISOLOCALData, ActionID::INFO>() && MustSup<AVISOLOCALData, ActionID::TSC>() && MustSup<AVISOLOCALData, ActionID::UV>() &&
+                           MustSup<AVISOLOCALData, ActionID::GENINTFILE>();
+
+constexpr bool BINFILEsup = MustSup<BINFILEData, ActionID::INFO>() && MustSup<BINFILEData, ActionID::TSC>() && MustSup<BINFILEData, ActionID::UV>();
+
+template<class T, ActionID id> static constexpr bool DisableAction = false;
+
+// Exceptions
+template<> constexpr bool DisableAction<BINFILEData, ActionID::GENINTFILE> = true;
diff --git a/src/odm.cpp b/src/odm.cpp
index 149552b..1129643 100644
--- a/src/odm.cpp
+++ b/src/odm.cpp
@@ -87,7 +87,7 @@ int main(int argc, char** argv)
           [&data = arg, &args = std::as_const(args)](const auto& arg)
           {
            using AT = std::decay_t<decltype(arg)>;
-           if constexpr(IsActionSupported<DT, AT::action>)
+           if constexpr(IsActionSupported<DT, AT::action> && !DisableAction<DT,AT::action>)
             return DoAction<AT::action>(args, data);
            else
             return MString("Unsupported combination of action and source");