6 files changed, 20 insertions, 0 deletions
diff --git a/src/bindings/swig/csharp/uscxml.i b/src/bindings/swig/csharp/uscxml.i
index 334a534..e218bf4 100644
--- a/src/bindings/swig/csharp/uscxml.i
+++ b/src/bindings/swig/csharp/uscxml.i
@@ -21,6 +21,7 @@ typedef uscxml::SendRequest SendRequest;
 typedef uscxml::Invoker Invoker;
 typedef uscxml::IOProcessor IOProcessor;
 typedef uscxml::DataModel DataModel;
+typedef uscxml::DataModelExtension DataModelExtension;
 typedef uscxml::ExecutableContent ExecutableContent;
 typedef uscxml::InvokerImpl InvokerImpl;
 typedef uscxml::IOProcessorImpl IOProcessorImpl;
@@ -30,6 +31,7 @@ typedef uscxml::InterpreterIssue InterpreterIssue;
 
 %feature("director") uscxml::WrappedInvoker;
 %feature("director") uscxml::WrappedDataModel;
+%feature("director") uscxml::WrappedDataModelExtension;
 %feature("director") uscxml::WrappedIOProcessor;
 %feature("director") uscxml::WrappedExecutableContent;
 %feature("director") uscxml::WrappedInterpreterMonitor;
diff --git a/src/bindings/swig/java/uscxml.i b/src/bindings/swig/java/uscxml.i
index 22fad3c..9a86c28 100644
--- a/src/bindings/swig/java/uscxml.i
+++ b/src/bindings/swig/java/uscxml.i
@@ -21,6 +21,7 @@ typedef uscxml::SendRequest SendRequest;
 typedef uscxml::Invoker Invoker;
 typedef uscxml::IOProcessor IOProcessor;
 typedef uscxml::DataModel DataModel;
+typedef uscxml::DataModelExtension DataModelExtension;
 typedef uscxml::ExecutableContent ExecutableContent;
 typedef uscxml::InvokerImpl InvokerImpl;
 typedef uscxml::IOProcessorImpl IOProcessorImpl;
@@ -30,6 +31,7 @@ typedef uscxml::InterpreterIssue InterpreterIssue;
 
 %feature("director") uscxml::WrappedInvoker;
 %feature("director") uscxml::WrappedDataModel;
+%feature("director") uscxml::WrappedDataModelExtension;
 %feature("director") uscxml::WrappedIOProcessor;
 %feature("director") uscxml::WrappedExecutableContent;
 %feature("director") uscxml::WrappedInterpreterMonitor;
diff --git a/src/bindings/swig/uscxml_beautify.i b/src/bindings/swig/uscxml_beautify.i
index 751be78..0350426 100644
--- a/src/bindings/swig/uscxml_beautify.i
+++ b/src/bindings/swig/uscxml_beautify.i
@@ -1,5 +1,7 @@
 %rename(NativeDataModel) DataModel;
 %rename(DataModel) WrappedDataModel;
+%rename(NativeDataModelExtension) DataModelExtension;
+%rename(DataModelExtension) WrappedDataModelExtension;
 %rename(NativeExecutableContent) ExecutableContent;
 %rename(ExecutableContent) WrappedExecutableContent;
 %rename(NativeInvoker) Invoker;
diff --git a/src/bindings/swig/uscxml_ignores.i b/src/bindings/swig/uscxml_ignores.i
index be597bc..7f7f7a3 100644
--- a/src/bindings/swig/uscxml_ignores.i
+++ b/src/bindings/swig/uscxml_ignores.i
@@ -136,6 +136,7 @@
 %ignore uscxml::WrappedDataModel::eval(const Arabica::DOM::Element<std::string>&, const std::string&);
 %ignore uscxml::WrappedDataModel::evalAsBool(const Arabica::DOM::Node<std::string>&, const std::string&);
 
+%ignore uscxml::DataModelExtension::dm;
 
 // Executable Content
 
diff --git a/src/bindings/swig/wrapped/WrappedDataModel.cpp b/src/bindings/swig/wrapped/WrappedDataModel.cpp
index 8ba57be..e0124eb 100644
--- a/src/bindings/swig/wrapped/WrappedDataModel.cpp
+++ b/src/bindings/swig/wrapped/WrappedDataModel.cpp
@@ -21,6 +21,9 @@
 
 namespace uscxml {
 
+WrappedDataModelExtension::WrappedDataModelExtension() {}
+WrappedDataModelExtension::~WrappedDataModelExtension() {}
+
 WrappedDataModel::WrappedDataModel() {}
 WrappedDataModel::~WrappedDataModel() {}
 
diff --git a/src/bindings/swig/wrapped/WrappedDataModel.h b/src/bindings/swig/wrapped/WrappedDataModel.h
index e988dc0..f33f5da 100644
--- a/src/bindings/swig/wrapped/WrappedDataModel.h
+++ b/src/bindings/swig/wrapped/WrappedDataModel.h
@@ -33,8 +33,18 @@
 
 namespace uscxml {
 
+class WrappedDataModelExtension : public DataModelExtension {
+public:
+	WrappedDataModelExtension();
+	virtual ~WrappedDataModelExtension();
+	virtual std::string provides() { return ""; }
+	virtual Data getValueOf(const std::string& member) { return Data(); }
+	virtual void setValueOf(const std::string& member, const Data& data) { }
+};
+
 class WrappedDataModel : public DataModelImpl {
 public:
+		
 	WrappedDataModel();
 	virtual ~WrappedDataModel();