Refactoring finished

Support datamodels, invokers and ioprocessors as plugins
Comply to HTTP1.1 by sending host header field
Started prolog datamodel

10 files changed, 728 insertions, 729 deletions

diff --git a/src/uscxml/plugins/invoker/modality/MMIComponent.cpp b/src/uscxml/plugins/invoker/modality/MMIComponent.cpp
index 0655806..170f4bc 100644
--- a/src/uscxml/plugins/invoker/modality/MMIComponent.cpp
+++ b/src/uscxml/plugins/invoker/modality/MMIComponent.cpp
@@ -2,41 +2,41 @@
 #include "uscxml/Interpreter.h"
 
 namespace uscxml {
-	
+
 MMIComponent::MMIComponent() {
 }
 
-  
+
 MMIComponent::~MMIComponent() {
 };
-  
+
 Invoker* MMIComponent::create(Interpreter* interpreter) {
-  MMIComponent* invoker = new MMIComponent();
-  invoker->_interpreter = interpreter;
-  return invoker;
+	MMIComponent* invoker = new MMIComponent();
+	invoker->_interpreter = interpreter;
+	return invoker;
 }
 
 Data MMIComponent::getDataModelVariables() {
-  Data data;
-  return data;
+	Data data;
+	return data;
 }
 
 void MMIComponent::send(SendRequest& req) {
-  
+
 }
 
 void MMIComponent::cancel(const std::string sendId) {
-  assert(false);  
+	assert(false);
 }
 
 void MMIComponent::sendToParent(SendRequest& req) {
-  req.invokeid = _invokeId;
-  assert(false);
+	req.invokeid = _invokeId;
+	assert(false);
 }
 
 void MMIComponent::invoke(InvokeRequest& req) {
-  _invokeId = req.invokeid;
-  
+	_invokeId = req.invokeid;
+
 }
 
 }
\ No newline at end of file
diff --git a/src/uscxml/plugins/invoker/modality/MMIComponent.h b/src/uscxml/plugins/invoker/modality/MMIComponent.h
index a83775f..96d796b 100644
--- a/src/uscxml/plugins/invoker/modality/MMIComponent.h
+++ b/src/uscxml/plugins/invoker/modality/MMIComponent.h
@@ -9,27 +9,27 @@ class Interpreter;
 
 class MMIComponent : public Invoker {
 public:
-	
-  enum State {
-		PAUSED,
-		RUNNING,
-		IDLE,
-		TERMINATED
+
+	enum State {
+	    PAUSED,
+	    RUNNING,
+	    IDLE,
+	    TERMINATED
 	};
 
 	MMIComponent();
-  virtual ~MMIComponent();
-  virtual Invoker* create(Interpreter* interpreter);
-  
-  virtual Data getDataModelVariables();
-  virtual void send(SendRequest& req);
-  virtual void cancel(const std::string sendId);
-  virtual void invoke(InvokeRequest& req);
-  virtual void sendToParent(SendRequest& req);
+	virtual ~MMIComponent();
+	virtual Invoker* create(Interpreter* interpreter);
+
+	virtual Data getDataModelVariables();
+	virtual void send(SendRequest& req);
+	virtual void cancel(const std::string sendId);
+	virtual void invoke(InvokeRequest& req);
+	virtual void sendToParent(SendRequest& req);
 
 protected:
-  std::string _invokeId;
-  Interpreter* _interpreter;
+	std::string _invokeId;
+	Interpreter* _interpreter;
 
 	State _state;
 };
@@ -39,31 +39,31 @@ protected:
 
 class MMICoreMessage {
 public:
-  std::string source;
-  std::string target;
-  std::string data;
-  std::string requestId;
+	std::string source;
+	std::string target;
+	std::string data;
+	std::string requestId;
 };
 
 class MMICtxMessage : public MMICoreMessage {
 public:
-  std::string context;
+	std::string context;
 };
 
 class MMIStartMessage : public MMICtxMessage {
 public:
-  std::string content;
-  std::string contentURL;
+	std::string content;
+	std::string contentURL;
 };
 
 class MMISimpleStatusMessage : public MMICtxMessage {
 public:
-  std::string status;
+	std::string status;
 };
 
 class MMIStatusMessage : public MMISimpleStatusMessage {
 public:
-  std::string statusInfo;
+	std::string statusInfo;
 };
 
 /** Concrete MMI messages */
@@ -86,7 +86,7 @@ class MMIPrepareRequest : public MMIStartMessage {};
 /***/
 
 class MMIExtensionNotification : public MMICtxMessage {
-  std::string name;
+	std::string name;
 };
 
 /***/
diff --git a/src/uscxml/plugins/invoker/modality/UmundoComponent.cpp b/src/uscxml/plugins/invoker/modality/UmundoComponent.cpp
index 22dd279..10f23d4 100644
--- a/src/uscxml/plugins/invoker/modality/UmundoComponent.cpp
+++ b/src/uscxml/plugins/invoker/modality/UmundoComponent.cpp
@@ -2,48 +2,48 @@
 #include "uscxml/Interpreter.h"
 
 namespace uscxml {
-	
-UmundoComponent::UmundoComponent() {	
+
+UmundoComponent::UmundoComponent() {
 }
 
-  
+
 UmundoComponent::~UmundoComponent() {
-  delete _invokedInterpreter;
+	delete _invokedInterpreter;
 };
-  
+
 Invoker* UmundoComponent::create(Interpreter* interpreter) {
-  UmundoComponent* invoker = new UmundoComponent();
-  invoker->_parentInterpreter = interpreter;
-  return invoker;
+	UmundoComponent* invoker = new UmundoComponent();
+	invoker->_parentInterpreter = interpreter;
+	return invoker;
 }
 
 Data UmundoComponent::getDataModelVariables() {
-  Data data;
-  return data;
+	Data data;
+	return data;
 }
 
 void UmundoComponent::send(SendRequest& req) {
-  assert(false);
+	assert(false);
 }
 
 void UmundoComponent::cancel(const std::string sendId) {
-  assert(false);  
+	assert(false);
 }
 
 void UmundoComponent::sendToParent(SendRequest& req) {
-  req.invokeid = _invokeId;
-  _parentInterpreter->receive(req);
+	req.invokeid = _invokeId;
+	_parentInterpreter->receive(req);
 }
 
 void UmundoComponent::invoke(InvokeRequest& req) {
-  _invokeId = req.invokeid;
-  _invokedInterpreter = Interpreter::fromURI(req.src);
-  DataModel* dataModel = _invokedInterpreter->getDataModel();
-  if (dataModel != NULL) {
-    
-  }
-  _invokedInterpreter->setInvoker(this);
-  _invokedInterpreter->start();
+	_invokeId = req.invokeid;
+	_invokedInterpreter = Interpreter::fromURI(req.src);
+	DataModel* dataModel = _invokedInterpreter->getDataModel();
+	if (dataModel != NULL) {
+
+	}
+	_invokedInterpreter->setInvoker(this);
+	_invokedInterpreter->start();
 }
 
 }
\ No newline at end of file
diff --git a/src/uscxml/plugins/invoker/modality/UmundoComponent.h b/src/uscxml/plugins/invoker/modality/UmundoComponent.h
index f2c76c4..69b3961 100644
--- a/src/uscxml/plugins/invoker/modality/UmundoComponent.h
+++ b/src/uscxml/plugins/invoker/modality/UmundoComponent.h
@@ -6,25 +6,25 @@
 namespace uscxml {
 
 class Interpreter;
-  
+
 class UmundoComponent : public MMIComponent {
 public:
 	UmundoComponent();
-  virtual ~UmundoComponent();
-  virtual Invoker* create(Interpreter* interpreter);
-  
-  virtual Data getDataModelVariables();
-  virtual void send(SendRequest& req);
-  virtual void cancel(const std::string sendId);
-  virtual void invoke(InvokeRequest& req);
-  virtual void sendToParent(SendRequest& req);
+	virtual ~UmundoComponent();
+	virtual Invoker* create(Interpreter* interpreter);
+
+	virtual Data getDataModelVariables();
+	virtual void send(SendRequest& req);
+	virtual void cancel(const std::string sendId);
+	virtual void invoke(InvokeRequest& req);
+	virtual void sendToParent(SendRequest& req);
 
 protected:
-  std::string _invokeId;
-  Interpreter* _invokedInterpreter;
-  Interpreter* _parentInterpreter;
+	std::string _invokeId;
+	Interpreter* _invokedInterpreter;
+	Interpreter* _parentInterpreter;
 };
-	
+
 }
 
 #endif /* end of include guard: UMUNDOCOMPONENT_H_VMW54W1R */
diff --git a/src/uscxml/plugins/invoker/modality/miles/SpatialAudio.cpp b/src/uscxml/plugins/invoker/modality/miles/SpatialAudio.cpp
index 13091ae..acc5c4b 100644
--- a/src/uscxml/plugins/invoker/modality/miles/SpatialAudio.cpp
+++ b/src/uscxml/plugins/invoker/modality/miles/SpatialAudio.cpp
@@ -14,184 +14,184 @@ namespace uscxml {
 
 #ifdef BUILD_AS_PLUGINS
 PLUMA_CONNECTOR
-bool connect(pluma::Host& host){
-    host.add( new SpatialAudioProvider() );
-    return true;
+bool connect(pluma::Host& host) {
+	host.add( new SpatialAudioProvider() );
+	return true;
 }
 #endif
 
 SpatialAudio::SpatialAudio() {
-  _audioDevOpen = false;
-  _audioDev = NULL;
-  _audioDevIndex = -1;
-  _pos = new float[3];
-  _pos[0] = _pos[1] = _pos[2] = 0.0;
-  _listener = new float[3];
-  _listener[0] = _listener[1] = _listener[2] = 0.0;
+	_audioDevOpen = false;
+	_audioDev = NULL;
+	_audioDevIndex = -1;
+	_pos = new float[3];
+	_pos[0] = _pos[1] = _pos[2] = 0.0;
+	_listener = new float[3];
+	_listener[0] = _listener[1] = _listener[2] = 0.0;
 }
 
-  
+
 SpatialAudio::~SpatialAudio() {
 };
-  
+
 Invoker* SpatialAudio::create(Interpreter* interpreter) {
-  SpatialAudio* invoker = new SpatialAudio();
-  invoker->_interpreter = interpreter;
-  return invoker;
+	SpatialAudio* invoker = new SpatialAudio();
+	invoker->_interpreter = interpreter;
+	return invoker;
 }
 
 Data SpatialAudio::getDataModelVariables() {
-  Data data;
+	Data data;
 //  data.compound["foo"] = Data("32");
-  return data;
+	return data;
 }
 
 void SpatialAudio::send(SendRequest& req) {
-  if (!_audioDevOpen) {
-    _audioDev = miles_audio_device_open(_audioDevIndex, 0, 22050, 2, 1, 0);
-    if (_audioDev != NULL) {
-      _audioDevOpen = true;
-      float rolloffFactor = 0.2;
-      miles_audio_device_control(_audioDev, MILES_AUDIO_DEVICE_CTRL_SET_ROLLOFF_FACTOR, &rolloffFactor);
-    }
-  }
-    
-  if (boost::iequals(req.name, "play")) {
-    if (_audioDevOpen) {
-      getPosFromParams(req.params, _pos);
+	if (!_audioDevOpen) {
+		_audioDev = miles_audio_device_open(_audioDevIndex, 0, 22050, 2, 1, 0);
+		if (_audioDev != NULL) {
+			_audioDevOpen = true;
+			float rolloffFactor = 0.2;
+			miles_audio_device_control(_audioDev, MILES_AUDIO_DEVICE_CTRL_SET_ROLLOFF_FACTOR, &rolloffFactor);
+		}
+	}
+
+	if (boost::iequals(req.name, "play")) {
+		if (_audioDevOpen) {
+			getPosFromParams(req.params, _pos);
 
 //      std::cout << "Source: ";
 //      for (int i = 0; i < 3; i++) {
 //        std::cout << _pos[i] << " ";
 //      }
 //      std::cout << std::endl;
-      
-      miles_audio_device_control(_audioDev, MILES_AUDIO_DEVICE_CTRL_SET_POSITION, _pos);
-      
-      char* buffer = (char*)malloc(_audioDev->chunk_size);
-      // skip wav header
-      _dataStream.seekg(44);
-
-      while(_dataStream.readsome(buffer, _audioDev->chunk_size) != 0) {
-        miles_audio_device_write(_audioDev, buffer, _audioDev->chunk_size);
-      }
-      free(buffer);
-    }
-  } else if (boost::iequals(req.name, "move.listener")) {
-    if (_audioDevOpen) {
-      getPosFromParams(req.params, _listener);
-
-      std::cout << "Listener: ";
-      for (int i = 0; i < 3; i++) {
-        std::cout << _listener[i] << " ";
-      }
-      std::cout << std::endl;
-      
-      miles_audio_device_control(_audioDev, MILES_AUDIO_DEVICE_CTRL_SET_LISTENER_POS, _listener);
-
-    }
-  }
+
+			miles_audio_device_control(_audioDev, MILES_AUDIO_DEVICE_CTRL_SET_POSITION, _pos);
+
+			char* buffer = (char*)malloc(_audioDev->chunk_size);
+			// skip wav header
+			_dataStream.seekg(44);
+
+			while(_dataStream.readsome(buffer, _audioDev->chunk_size) != 0) {
+				miles_audio_device_write(_audioDev, buffer, _audioDev->chunk_size);
+			}
+			free(buffer);
+		}
+	} else if (boost::iequals(req.name, "move.listener")) {
+		if (_audioDevOpen) {
+			getPosFromParams(req.params, _listener);
+
+			std::cout << "Listener: ";
+			for (int i = 0; i < 3; i++) {
+				std::cout << _listener[i] << " ";
+			}
+			std::cout << std::endl;
+
+			miles_audio_device_control(_audioDev, MILES_AUDIO_DEVICE_CTRL_SET_LISTENER_POS, _listener);
+
+		}
+	}
 }
 
 void SpatialAudio::cancel(const std::string sendId) {
-  assert(false);
+	assert(false);
 }
 
 void SpatialAudio::sendToParent(SendRequest& req) {
-  req.invokeid = _invokeId;
-  assert(false);
+	req.invokeid = _invokeId;
+	assert(false);
 }
 
 void SpatialAudio::invoke(InvokeRequest& req) {
-  _invokeId = req.invokeid;
-  
-  if (req.src.length() > 0) {
-    Arabica::io::URI url(req.src);
-    if (!_interpreter->makeAbsolute(url)) {
-      LOG(ERROR) << "Source attribute for audio invoker has relative URI " << req.src << " with no base URI set for interpreter";
-      return;
-    }
-    
-   	URL scriptUrl(url.as_string());
-    _dataStream << scriptUrl;
-  }
-
-  getPosFromParams(req.params, _pos);
-
-  struct miles_audio_device_description *devices;
-  int ndevs;
-  
+	_invokeId = req.invokeid;
+
+	if (req.src.length() > 0) {
+		Arabica::io::URI url(req.src);
+		if (!_interpreter->makeAbsolute(url)) {
+			LOG(ERROR) << "Source attribute for audio invoker has relative URI " << req.src << " with no base URI set for interpreter";
+			return;
+		}
+
+		URL scriptUrl(url.as_string());
+		_dataStream << scriptUrl;
+	}
+
+	getPosFromParams(req.params, _pos);
+
+	struct miles_audio_device_description *devices;
+	int ndevs;
+
 	ndevs = miles_audio_device_get_supported_devices(&devices);
-  
-  for (int i = 0; i < ndevs; i++) {
+
+	for (int i = 0; i < ndevs; i++) {
 		if ((devices[i].capabilities & MILES_AUDIO_DEVICE_CAPABILITY_SPATIAL) &&
-        (devices[i].capabilities & MILES_AUDIO_DEVICE_CAPABILITY_OUTPUT)) {
-      _audioDevIndex = i;
-      break;
-    }
-  }
+		        (devices[i].capabilities & MILES_AUDIO_DEVICE_CAPABILITY_OUTPUT)) {
+			_audioDevIndex = i;
+			break;
+		}
+	}
 }
 
-  void SpatialAudio::getPosFromParams(std::map<std::string, std::list<std::string> >& params, float* position) {
-  // vector explicitly given
-  try {
-    if (params.find("x") != params.end())
-      position[0] = boost::lexical_cast<float>(params["x"].front());
-    if (params.find("y") != params.end())
-      position[1] = boost::lexical_cast<float>(params["y"].front());
-    if (params.find("z") != params.end())
-      position[2] = boost::lexical_cast<float>(params["z"].front());
-  } catch (boost::bad_lexical_cast& e) {
-    LOG(ERROR) << "Cannot interpret x, y or z as float value in params: " << e.what();
-  }
-  
-  try {
-    // right is an alias for x
-    if (params.find("right") != params.end())
-      position[0] = boost::lexical_cast<float>(params["right"].front());
-    // height is an alias for y
-    if (params.find("height") != params.end())
-      position[1] = boost::lexical_cast<float>(params["height"].front());
-    // front is an alias for z
-    if (params.find("front") != params.end())
-      position[2] = boost::lexical_cast<float>(params["front"].front());
-  } catch (boost::bad_lexical_cast& e) {
-    LOG(ERROR) << "Cannot interpret right, height or front as float value in params: " << e.what();
-  }
-
-  // do we have a position on a circle?
-  try {
-    if (params.find("circle") != params.end()) {
-      float rad = posToRadian(params["circle"].front());
-      position[0] = cosf(rad);
-      position[2] = -1 * sinf(rad); // z axis increases to front
-    }
-  } catch (boost::bad_lexical_cast& e) {
-    LOG(ERROR) << "Cannot interpret circle as float value in params: " << e.what();
-  }
+void SpatialAudio::getPosFromParams(std::map<std::string, std::list<std::string> >& params, float* position) {
+	// vector explicitly given
+	try {
+		if (params.find("x") != params.end())
+			position[0] = boost::lexical_cast<float>(params["x"].front());
+		if (params.find("y") != params.end())
+			position[1] = boost::lexical_cast<float>(params["y"].front());
+		if (params.find("z") != params.end())
+			position[2] = boost::lexical_cast<float>(params["z"].front());
+	} catch (boost::bad_lexical_cast& e) {
+		LOG(ERROR) << "Cannot interpret x, y or z as float value in params: " << e.what();
+	}
+
+	try {
+		// right is an alias for x
+		if (params.find("right") != params.end())
+			position[0] = boost::lexical_cast<float>(params["right"].front());
+		// height is an alias for y
+		if (params.find("height") != params.end())
+			position[1] = boost::lexical_cast<float>(params["height"].front());
+		// front is an alias for z
+		if (params.find("front") != params.end())
+			position[2] = boost::lexical_cast<float>(params["front"].front());
+	} catch (boost::bad_lexical_cast& e) {
+		LOG(ERROR) << "Cannot interpret right, height or front as float value in params: " << e.what();
+	}
+
+	// do we have a position on a circle?
+	try {
+		if (params.find("circle") != params.end()) {
+			float rad = posToRadian(params["circle"].front());
+			position[0] = cosf(rad);
+			position[2] = -1 * sinf(rad); // z axis increases to front
+		}
+	} catch (boost::bad_lexical_cast& e) {
+		LOG(ERROR) << "Cannot interpret circle as float value in params: " << e.what();
+	}
 //  std::cout << _pos[0] << ":" << _pos[1] << ":" << _pos[2] << std::endl;
 
 }
-  
+
 float SpatialAudio::posToRadian(std::string& position) {
-  boost::trim(position);
-  float rad = 0;
-  
-  if (position.size() > 3 && boost::iequals("deg", position.substr(position.length() - 3, 3))) {
-    rad = boost::lexical_cast<float>(position.substr(0, position.size() - 3));
-    rad = fmodf(rad, 360); // into range [0-360]
-    rad /= 180; // into range [0-2]
-    rad *= M_PI; // into range [0-2PI]
-    rad -= M_PI_2; // 0 to top;
-    rad *= -1; // make clockwise
-    rad += 2 * M_PI; // make positive
-  } else if (position.size() > 3 && boost::iequals("rad", position.substr(position.length() - 3, 3))) {
-    rad = boost::lexical_cast<float>(position.substr(0, position.size() - 3));
-    rad = fmodf(rad, M_PI * 2); // into range [0-2*PI]
-  } else {
-    LOG(ERROR) << "Cannot make sense of position value " << position << ": does not end in 'deg', 'rad'";
-  }
-  return rad;
+	boost::trim(position);
+	float rad = 0;
+
+	if (position.size() > 3 && boost::iequals("deg", position.substr(position.length() - 3, 3))) {
+		rad = boost::lexical_cast<float>(position.substr(0, position.size() - 3));
+		rad = fmodf(rad, 360); // into range [0-360]
+		rad /= 180; // into range [0-2]
+		rad *= M_PI; // into range [0-2PI]
+		rad -= M_PI_2; // 0 to top;
+		rad *= -1; // make clockwise
+		rad += 2 * M_PI; // make positive
+	} else if (position.size() > 3 && boost::iequals("rad", position.substr(position.length() - 3, 3))) {
+		rad = boost::lexical_cast<float>(position.substr(0, position.size() - 3));
+		rad = fmodf(rad, M_PI * 2); // into range [0-2*PI]
+	} else {
+		LOG(ERROR) << "Cannot make sense of position value " << position << ": does not end in 'deg', 'rad'";
+	}
+	return rad;
 }
-  
+
 }
\ No newline at end of file
diff --git a/src/uscxml/plugins/invoker/modality/miles/SpatialAudio.h b/src/uscxml/plugins/invoker/modality/miles/SpatialAudio.h
index bbbf478..7632f52 100644
--- a/src/uscxml/plugins/invoker/modality/miles/SpatialAudio.h
+++ b/src/uscxml/plugins/invoker/modality/miles/SpatialAudio.h
@@ -14,14 +14,14 @@ extern "C" {
 namespace uscxml {
 
 class Interpreter;
-  
+
 class SpatialAudio : public MMIComponent {
 public:
 	SpatialAudio();
-  virtual ~SpatialAudio();
-  virtual Invoker* create(Interpreter* interpreter);
-  
-	virtual std::set<std::string> getNames() { 
+	virtual ~SpatialAudio();
+	virtual Invoker* create(Interpreter* interpreter);
+
+	virtual std::set<std::string> getNames() {
 		std::set<std::string> names;
 		names.insert("spatial-audio");
 		names.insert("audio");
@@ -30,29 +30,29 @@ public:
 		return names;
 	}
 
-  virtual Data getDataModelVariables();
-  virtual void send(SendRequest& req);
-  virtual void cancel(const std::string sendId);
-  virtual void invoke(InvokeRequest& req);
-  virtual void sendToParent(SendRequest& req);
+	virtual Data getDataModelVariables();
+	virtual void send(SendRequest& req);
+	virtual void cancel(const std::string sendId);
+	virtual void invoke(InvokeRequest& req);
+	virtual void sendToParent(SendRequest& req);
 
-  void getPosFromParams(std::map<std::string, std::list<std::string> >& params, float* position);
-  static float posToRadian(std::string& position);
+	void getPosFromParams(std::map<std::string, std::list<std::string> >& params, float* position);
+	static float posToRadian(std::string& position);
 
 protected:
-  std::string _invokeId;
-  Interpreter* _invokedInterpreter;
-  
-  std::stringstream _dataStream;
-  
-  float* _pos;
-  float* _listener;
-  bool _audioDevOpen;
-  int _audioDevIndex;
-  struct miles_audio_device* _audioDev;
+	std::string _invokeId;
+	Interpreter* _invokedInterpreter;
+
+	std::stringstream _dataStream;
+
+	float* _pos;
+	float* _listener;
+	bool _audioDevOpen;
+	int _audioDevIndex;
+	struct miles_audio_device* _audioDev;
 
 };
-	
+
 }
 
 #endif /* end of include guard: SPATIALAUDIO_H_EH11SAQC */
diff --git a/src/uscxml/plugins/invoker/scxml/USCXMLInvoker.cpp b/src/uscxml/plugins/invoker/scxml/USCXMLInvoker.cpp
index 0e617b9..b4ee3eb 100644
--- a/src/uscxml/plugins/invoker/scxml/USCXMLInvoker.cpp
+++ b/src/uscxml/plugins/invoker/scxml/USCXMLInvoker.cpp
@@ -1,6 +1,5 @@
-#include "uscxml/Common.h"
 #include "USCXMLInvoker.h"
-#include "uscxml/Interpreter.h"
+#include <glog/logging.h>
 
 #ifdef BUILD_AS_PLUGINS
 #include <Pluma/Connector.hpp>
@@ -10,53 +9,53 @@ namespace uscxml {
 
 #ifdef BUILD_AS_PLUGINS
 PLUMA_CONNECTOR
-bool connect(pluma::Host& host){
-    host.add( new USCXMLInvokerProvider() );
-    return true;
+bool connect(pluma::Host& host) {
+	host.add( new USCXMLInvokerProvider() );
+	return true;
 }
 #endif
 
-USCXMLInvoker::USCXMLInvoker() {	
+USCXMLInvoker::USCXMLInvoker() {
 }
 
-  
+
 USCXMLInvoker::~USCXMLInvoker() {
-  delete _invokedInterpreter;
+	delete _invokedInterpreter;
 };
-  
+
 Invoker* USCXMLInvoker::create(Interpreter* interpreter) {
-  USCXMLInvoker* invoker = new USCXMLInvoker();
-  invoker->_parentInterpreter = interpreter;
-  return invoker;
+	USCXMLInvoker* invoker = new USCXMLInvoker();
+	invoker->_parentInterpreter = interpreter;
+	return invoker;
 }
 
 Data USCXMLInvoker::getDataModelVariables() {
-  Data data;
-  return data;
+	Data data;
+	return data;
 }
 
 void USCXMLInvoker::send(SendRequest& req) {
-  assert(false);
+	assert(false);
 }
 
 void USCXMLInvoker::cancel(const std::string sendId) {
-  assert(false);  
+	assert(false);
 }
 
 void USCXMLInvoker::sendToParent(SendRequest& req) {
-  req.invokeid = _invokeId;
-  _parentInterpreter->receive(req);
+	req.invokeid = _invokeId;
+	_parentInterpreter->receive(req);
 }
 
 void USCXMLInvoker::invoke(InvokeRequest& req) {
-  _invokeId = req.invokeid;
-  _invokedInterpreter = Interpreter::fromURI(req.src);
-  DataModel* dataModel = _invokedInterpreter->getDataModel();
-  if (dataModel != NULL) {
-    
-  }
-  _invokedInterpreter->setInvoker(this);
-  _invokedInterpreter->start();
+	_invokeId = req.invokeid;
+	_invokedInterpreter = Interpreter::fromURI(req.src);
+	DataModel* dataModel = _invokedInterpreter->getDataModel();
+	if (dataModel != NULL) {
+
+	}
+	_invokedInterpreter->setInvoker(this);
+	_invokedInterpreter->start();
 }
 
 }
\ No newline at end of file
diff --git a/src/uscxml/plugins/invoker/scxml/USCXMLInvoker.h b/src/uscxml/plugins/invoker/scxml/USCXMLInvoker.h
index 9068a24..907df41 100644
--- a/src/uscxml/plugins/invoker/scxml/USCXMLInvoker.h
+++ b/src/uscxml/plugins/invoker/scxml/USCXMLInvoker.h
@@ -1,7 +1,7 @@
 #ifndef USCXMLINVOKER_H_OQFA21IO
 #define USCXMLINVOKER_H_OQFA21IO
 
-#include "uscxml/Factory.h"
+#include <uscxml/Interpreter.h>
 
 #ifdef BUILD_AS_PLUGINS
 #include "uscxml/plugins/Plugins.h"
@@ -10,13 +10,13 @@
 namespace uscxml {
 
 class Interpreter;
-  
+
 class USCXMLInvoker : public Invoker {
 public:
 	USCXMLInvoker();
-  virtual ~USCXMLInvoker();
-  virtual Invoker* create(Interpreter* interpreter);
-  virtual std::set<std::string> getNames() {
+	virtual ~USCXMLInvoker();
+	virtual Invoker* create(Interpreter* interpreter);
+	virtual std::set<std::string> getNames() {
 		std::set<std::string> names;
 		names.insert("uscxml");
 		names.insert("http://www.w3.org/TR/scxml");
@@ -24,16 +24,16 @@ public:
 		return names;
 	}
 
-  virtual Data getDataModelVariables();
-  virtual void send(SendRequest& req);
-  virtual void cancel(const std::string sendId);
-  virtual void invoke(InvokeRequest& req);
-  virtual void sendToParent(SendRequest& req);
+	virtual Data getDataModelVariables();
+	virtual void send(SendRequest& req);
+	virtual void cancel(const std::string sendId);
+	virtual void invoke(InvokeRequest& req);
+	virtual void sendToParent(SendRequest& req);
 
 protected:
-  std::string _invokeId;
-  Interpreter* _invokedInterpreter;
-  Interpreter* _parentInterpreter;
+	std::string _invokeId;
+	Interpreter* _invokedInterpreter;
+	Interpreter* _parentInterpreter;
 };
 
 #ifdef BUILD_AS_PLUGINS
diff --git a/src/uscxml/plugins/invoker/umundo/UmundoInvoker.cpp b/src/uscxml/plugins/invoker/umundo/UmundoInvoker.cpp
index 68ffe5a..ee6c903 100644
--- a/src/uscxml/plugins/invoker/umundo/UmundoInvoker.cpp
+++ b/src/uscxml/plugins/invoker/umundo/UmundoInvoker.cpp
@@ -1,7 +1,4 @@
-#include "uscxml/config.h"
-#include "uscxml/Common.h"
 #include "UmundoInvoker.h"
-#include "uscxml/Interpreter.h"
 #include <glog/logging.h>
 
 #ifdef BUILD_AS_PLUGINS
@@ -12,9 +9,9 @@ namespace uscxml {
 
 #ifdef BUILD_AS_PLUGINS
 PLUMA_CONNECTOR
-bool connect(pluma::Host& host){
-    host.add( new UmundoInvokerProvider() );
-    return true;
+bool connect(pluma::Host& host) {
+	host.add( new UmundoInvokerProvider() );
+	return true;
 }
 #endif
 
@@ -22,213 +19,215 @@ UmundoInvoker::UmundoInvoker() {
 }
 
 UmundoInvoker::~UmundoInvoker() {
-  _node.removeSubscriber(_sub);
-  _node.removePublisher(_pub);
+	_node.removeSubscriber(_sub);
+	_node.removePublisher(_pub);
 };
 
 Invoker* UmundoInvoker::create(Interpreter* interpreter) {
-  UmundoInvoker* invoker = new UmundoInvoker();
-  invoker->_interpreter = interpreter;
-  return invoker;
+	UmundoInvoker* invoker = new UmundoInvoker();
+	invoker->_interpreter = interpreter;
+	return invoker;
 }
 
 Data UmundoInvoker::getDataModelVariables() {
-  Data data;
-  return data;
+	Data data;
+	return data;
 }
 
 void UmundoInvoker::send(SendRequest& req) {
-  umundo::Message* msg = new umundo::Message();
-
-  if (req.name.length() > 0) {
-    msg->putMeta("event", req.name);
-  } else {
-    msg->putMeta("event", "umundo");  
-  }
-  
-  if (req.params.find("type") != req.params.end()) {
-    // assume JSON in content to transform to protobuf object
-    if (req.content.length() > 0 && _interpreter->getDataModel() != NULL) {
-      std::string type = req.params["type"].front();
-      const google::protobuf::Message* protoMsg = umundo::PBSerializer::getProto(type);
-      if (protoMsg == NULL) {
-        LOG(ERROR) << "No type " << type << " is known, pass a directory with proto .desc files via types param when invoking";
-        return;
-      }
-      try {
-        Data data = _interpreter->getDataModel()->getStringAsData(req.content);
-        google::protobuf::Message* pbMsg = protoMsg->New();
-        if (!dataToProtobuf(pbMsg, data)) {
-          LOG(ERROR) << "Cannot create message from JSON - not sending";
-        } else {
-          // add all s11n properties
-          if (!_isService) {
-            _pub.prepareMsg(msg, type, pbMsg);
-            _pub.send(msg);
-          } else {
-            std::map<umundo::ServiceDescription, umundo::ServiceStub*>::iterator svcIter = _svcs.begin();
-            while(svcIter != _svcs.end()) {
-              umundo::ServiceStub* stub = svcIter->second;
-              Event event;
-              void* rv = NULL;
-              stub->callStubMethod(req.name, pbMsg, type, rv, "");
-              protobufToData(event, *(const google::protobuf::Message*)rv);
-
-              event.name = _invokeId + ".reply." + req.name;
-              event.invokeid = _invokeId;
-              event.origin = msg->getMeta("um.channel");
-              event.origintype = "umundo";
-              event.type = Event::EXTERNAL;
-
-              _interpreter->receive(event);
-              svcIter++;
-            }
-          }
-        }
-      } catch (Event e) {
-        LOG(ERROR) << "Syntax error when invoking umundo:" << std::endl << e << std::endl;
-        return;
-      }
-    } else {
-      LOG(ERROR) << "Required JSON object in content" << std::endl;
-      return;
-    }
-  }
+	umundo::Message* msg = new umundo::Message();
+
+	if (req.name.length() > 0) {
+		msg->putMeta("event", req.name);
+	} else {
+		msg->putMeta("event", "umundo");
+	}
+
+	if (req.params.find("type") != req.params.end()) {
+		// assume JSON in content to transform to protobuf object
+		if (req.content.length() > 0 && _interpreter->getDataModel() != NULL) {
+			std::string type;
+			std::multimap<std::string, std::string>::iterator typeIter = req.params.find("type");
+			if (typeIter != req.params.end())
+				type = typeIter->second;
+			const google::protobuf::Message* protoMsg = umundo::PBSerializer::getProto(type);
+			if (protoMsg == NULL) {
+				LOG(ERROR) << "No type " << type << " is known, pass a directory with proto .desc files via types param when invoking";
+				return;
+			}
+			try {
+				Data data = _interpreter->getDataModel()->getStringAsData(req.content);
+				google::protobuf::Message* pbMsg = protoMsg->New();
+				if (!dataToProtobuf(pbMsg, data)) {
+					LOG(ERROR) << "Cannot create message from JSON - not sending";
+				} else {
+					// add all s11n properties
+					if (!_isService) {
+						_pub.prepareMsg(msg, type, pbMsg);
+						_pub.send(msg);
+					} else {
+						std::map<umundo::ServiceDescription, umundo::ServiceStub*>::iterator svcIter = _svcs.begin();
+						while(svcIter != _svcs.end()) {
+							umundo::ServiceStub* stub = svcIter->second;
+							Event event;
+							void* rv = NULL;
+							stub->callStubMethod(req.name, pbMsg, type, rv, "");
+							protobufToData(event, *(const google::protobuf::Message*)rv);
+
+							event.name = _invokeId + ".reply." + req.name;
+							event.invokeid = _invokeId;
+							event.origin = msg->getMeta("um.channel");
+							event.origintype = "umundo";
+							event.type = Event::EXTERNAL;
+
+							_interpreter->receive(event);
+							svcIter++;
+						}
+					}
+				}
+			} catch (Event e) {
+				LOG(ERROR) << "Syntax error when invoking umundo:" << std::endl << e << std::endl;
+				return;
+			}
+		} else {
+			LOG(ERROR) << "Required JSON object in content" << std::endl;
+			return;
+		}
+	}
 }
 
 void UmundoInvoker::cancel(const std::string sendId) {
-  assert(false);
+	assert(false);
 }
 
 void UmundoInvoker::sendToParent(SendRequest& req) {
-  assert(false);
+	assert(false);
 }
 
 void UmundoInvoker::invoke(InvokeRequest& req) {
-  _invokeId = req.invokeid;
-  
-  std::string channelName;
-  std::string serviceName;
-  
-  if (req.params.find("channel") != req.params.end()) {
-    channelName = req.params["channel"].front();
-    _isService = false;
-  } else if (req.params.find("service") != req.params.end()) {
-    serviceName = req.params["service"].front();
-    _isService = true;
-  } else {
-    LOG(ERROR) << "Invoking umundo needs a service or a channel param";
-    return;
-  }
-  
-  _node = getNode(_interpreter);
-  
-  // add types from .proto or .desc files
-  if (req.params.find("types") != req.params.end()) {
-    std::list<std::string>::iterator typeIter = req.params["types"].begin();
-    while(typeIter != req.params["types"].end()) {
-      Arabica::io::URI srcURI(*typeIter);
-      // if (!_interpreter->makeAbsolute(srcURI)) {
-      //   LOG(ERROR) << "Relative URI for types in umundo invoker " << *typeIter <<  " with no base URI set for interpreter";
-      //   return;
-      // }
-      umundo::PBSerializer::addProto(srcURI.path());
-      typeIter++;
-    }
-  }
-
-  if (!_isService) {
-    // use umundo to publish objects on a channel
-    _pub = umundo::TypedPublisher(channelName);
-    _sub = umundo::TypedSubscriber(channelName, this);
-    
-    _node.addPublisher(_pub);
-    _node.addSubscriber(_sub);
-    
-  } else if (serviceName.length() > 0) {
-    // use umundo to access services
-    _svcFilter = umundo::ServiceFilter(serviceName);
-    _node.connect(&_svcMgr);
-    _svcMgr.startQuery(_svcFilter, this);
-  }
+	_invokeId = req.invokeid;
+
+	std::string channelName;
+	std::string serviceName;
+
+	if (req.params.find("channel") != req.params.end()) {
+		channelName = req.params.find("type")->second;
+		_isService = false;
+	} else if (req.params.find("service") != req.params.end()) {
+		serviceName = req.params.find("service")->second;
+		_isService = true;
+	} else {
+		LOG(ERROR) << "Invoking umundo needs a service or a channel param";
+		return;
+	}
+
+	_node = getNode(_interpreter);
+
+	// add types from .proto or .desc files
+	if (req.params.find("types") != req.params.end()) {
+		std::pair<InvokeRequest::params_t::iterator, InvokeRequest::params_t::iterator> typeRange = req.params.equal_range("types");
+		for (InvokeRequest::params_t::iterator it = typeRange.first; it != typeRange.second; it++) {
+			Arabica::io::URI srcURI(it->first);
+			// if (!_interpreter->makeAbsolute(srcURI)) {
+			//   LOG(ERROR) << "Relative URI for types in umundo invoker " << *typeIter <<  " with no base URI set for interpreter";
+			//   return;
+			// }
+			umundo::PBSerializer::addProto(srcURI.path());
+		}
+	}
+
+	if (!_isService) {
+		// use umundo to publish objects on a channel
+		_pub = umundo::TypedPublisher(channelName);
+		_sub = umundo::TypedSubscriber(channelName, this);
+
+		_node.addPublisher(_pub);
+		_node.addSubscriber(_sub);
+
+	} else if (serviceName.length() > 0) {
+		// use umundo to access services
+		_svcFilter = umundo::ServiceFilter(serviceName);
+		_node.connect(&_svcMgr);
+		_svcMgr.startQuery(_svcFilter, this);
+	}
 }
 
 void UmundoInvoker::receive(void* object, umundo::Message* msg) {
-  uscxml::Event event;
-  if (msg->getMeta().find("event") != msg->getMeta().end()) {
-    event.name = msg->getMeta("event");
-  } else {
-    event.name = "umundo.rcvd";
-  }
-  
-  event.invokeid = _invokeId;
-  event.origin = msg->getMeta("um.channel");
-  event.origintype = "umundo";
-  event.type = Event::EXTERNAL;
-  
+	uscxml::Event event;
+	if (msg->getMeta().find("event") != msg->getMeta().end()) {
+		event.name = msg->getMeta("event");
+	} else {
+		event.name = "umundo.rcvd";
+	}
+
+	event.invokeid = _invokeId;
+	event.origin = msg->getMeta("um.channel");
+	event.origintype = "umundo";
+	event.type = Event::EXTERNAL;
+
 //  if (msg->getMeta().find("um.s11n.type") != msg->getMeta().end())
 //    event.compound["class"] = msg->getMeta("um.s11n.type");
-  
-  if (object != NULL)
-    protobufToData(event, *(const google::protobuf::Message*)object);
-  
-  // get meta fields into event
-  std::map<std::string, std::string>::const_iterator metaIter = msg->getMeta().begin();
-  while(metaIter != msg->getMeta().end()) {
-    if (metaIter->first.substr(0,3).compare("um.") != 0)
-      event.compound[metaIter->first] = Data(metaIter->second, Data::VERBATIM);
-    metaIter++;
-  }
-  
-  _interpreter->receive(event);
+
+	if (object != NULL)
+		protobufToData(event, *(const google::protobuf::Message*)object);
+
+	// get meta fields into event
+	std::map<std::string, std::string>::const_iterator metaIter = msg->getMeta().begin();
+	while(metaIter != msg->getMeta().end()) {
+		if (metaIter->first.substr(0,3).compare("um.") != 0)
+			event.compound[metaIter->first] = Data(metaIter->second, Data::VERBATIM);
+		metaIter++;
+	}
+
+	_interpreter->receive(event);
 }
 
 void UmundoInvoker::added(umundo::ServiceDescription desc) {
-  LOG(ERROR) << "Service found!";
-
-  umundo::ServiceStub* stub = new umundo::ServiceStub(desc);
-  _svcs[desc] = stub;
-
-  Event addedEvent;
-  addedEvent.invokeid = _invokeId;
-  addedEvent.origin = desc.getName();
-  addedEvent.origintype = "umundo";
-  addedEvent.type = Event::EXTERNAL;
-  addedEvent.name = _invokeId + ".added";
-  
-  std::map<std::string, std::string>::const_iterator propIter = desc.getProperties().begin();
-  while(propIter != desc.getProperties().end()) {
-    addedEvent.compound[propIter->first] = Data(propIter->second, Data::VERBATIM);
-    propIter++;
-  }
-
-  _interpreter->receive(addedEvent);
+	LOG(ERROR) << "Service found!";
+
+	umundo::ServiceStub* stub = new umundo::ServiceStub(desc);
+	_svcs[desc] = stub;
+
+	Event addedEvent;
+	addedEvent.invokeid = _invokeId;
+	addedEvent.origin = desc.getName();
+	addedEvent.origintype = "umundo";
+	addedEvent.type = Event::EXTERNAL;
+	addedEvent.name = _invokeId + ".added";
+
+	std::map<std::string, std::string>::const_iterator propIter = desc.getProperties().begin();
+	while(propIter != desc.getProperties().end()) {
+		addedEvent.compound[propIter->first] = Data(propIter->second, Data::VERBATIM);
+		propIter++;
+	}
+
+	_interpreter->receive(addedEvent);
 }
 
 void UmundoInvoker::removed(umundo::ServiceDescription desc) {
-  LOG(ERROR) << "Service lost!";
-
-  if (_svcs.find(desc) == _svcs.end()) {
-    return;
-  }
-  
-  delete _svcs[desc];
-  _svcs.erase(desc);
-
-  Event addedEvent;
-  addedEvent.invokeid = _invokeId;
-  addedEvent.origin = desc.getName();
-  addedEvent.origintype = "umundo";
-  addedEvent.type = Event::EXTERNAL;
-  addedEvent.name = _invokeId + ".removed";
-  
-  std::map<std::string, std::string>::const_iterator propIter = desc.getProperties().begin();
-  while(propIter != desc.getProperties().end()) {
-    addedEvent.compound[propIter->first] = Data(propIter->second, Data::VERBATIM);
-    propIter++;
-  }
-  
-  _interpreter->receive(addedEvent);
+	LOG(ERROR) << "Service lost!";
+
+	if (_svcs.find(desc) == _svcs.end()) {
+		return;
+	}
+
+	delete _svcs[desc];
+	_svcs.erase(desc);
+
+	Event addedEvent;
+	addedEvent.invokeid = _invokeId;
+	addedEvent.origin = desc.getName();
+	addedEvent.origintype = "umundo";
+	addedEvent.type = Event::EXTERNAL;
+	addedEvent.name = _invokeId + ".removed";
+
+	std::map<std::string, std::string>::const_iterator propIter = desc.getProperties().begin();
+	while(propIter != desc.getProperties().end()) {
+		addedEvent.compound[propIter->first] = Data(propIter->second, Data::VERBATIM);
+		propIter++;
+	}
+
+	_interpreter->receive(addedEvent);
 }
 
 void UmundoInvoker::changed(umundo::ServiceDescription desc) {
@@ -236,252 +235,252 @@ void UmundoInvoker::changed(umundo::ServiceDescription desc) {
 
 std::map<std::string, umundo::Node> UmundoInvoker::_nodes;
 umundo::Node UmundoInvoker::getNode(Interpreter* interpreter) {
-  if ((_nodes.find(interpreter->getName()) == _nodes.end())) {
-    _nodes[interpreter->getName()] = umundo::Node();
-  }
-  return _nodes[interpreter->getName()];
+	if ((_nodes.find(interpreter->getName()) == _nodes.end())) {
+		_nodes[interpreter->getName()] = umundo::Node();
+	}
+	return _nodes[interpreter->getName()];
 }
 
 bool UmundoInvoker::protobufToData(Data& data, const google::protobuf::Message& msg) {
-  const google::protobuf::Descriptor* desc = msg.GetDescriptor();
-  const google::protobuf::Reflection* reflect = msg.GetReflection();
-  
-  data.compound["type"] = Data(desc->name(), Data::VERBATIM);
-  
-  for (int i = 0; i < desc->field_count(); i++) {
-    const google::protobuf::FieldDescriptor* fieldDesc = desc->field(i);
-    std::string key = fieldDesc->name();
-    
-    if (!fieldDesc->is_repeated() && !reflect->HasField(msg, fieldDesc))
-      continue;
-    
-    switch(fieldDesc->type()) {
-      case google::protobuf::FieldDescriptor::TYPE_BOOL:
-        if (fieldDesc->is_repeated()) {
-          for (int j = 0; j < reflect->FieldSize(msg, fieldDesc); j++) {
-            data.compound[key].array.push_back(Data(reflect->GetRepeatedBool(msg, fieldDesc, j) ? "true" : "false"));
-          }
-        } else {
-          data.compound[key].atom = (reflect->GetBool(msg, fieldDesc) ? "true" : "false");
-        }
-        break;
-      case google::protobuf::FieldDescriptor::TYPE_BYTES:
-      case google::protobuf::FieldDescriptor::TYPE_STRING:
-        if (fieldDesc->is_repeated()) {
-          for (int j = 0; j < reflect->FieldSize(msg, fieldDesc); j++) {
-            data.compound[key].array.push_back(Data(toStr(reflect->GetRepeatedString(msg, fieldDesc, j)), Data::VERBATIM));
-          }
-        } else {
-          data.compound[key].atom = toStr(reflect->GetString(msg, fieldDesc));
-          data.compound[key].type = Data::VERBATIM;
-        }
-        break;
-      case google::protobuf::FieldDescriptor::TYPE_DOUBLE:
-        if (fieldDesc->is_repeated()) {
-          for (int j = 0; j < reflect->FieldSize(msg, fieldDesc); j++) {
-            data.compound[key].array.push_back(Data(toStr(reflect->GetRepeatedDouble(msg, fieldDesc, j))));
-          }
-        } else {
-          data.compound[key].atom = toStr(reflect->GetDouble(msg, fieldDesc));
-        }
-        break;
-      case google::protobuf::FieldDescriptor::TYPE_ENUM:
-        LOG(ERROR) << "TYPE_ENUM is unimplemented" << std::endl;
-        break;
-      case google::protobuf::FieldDescriptor::TYPE_FIXED32:
-      case google::protobuf::FieldDescriptor::TYPE_UINT32:
-        if (fieldDesc->is_repeated()) {
-          for (int j = 0; j < reflect->FieldSize(msg, fieldDesc); j++) {
-            data.compound[key].array.push_back(Data(toStr(reflect->GetRepeatedUInt32(msg, fieldDesc, j))));
-          }
-        } else {
-          data.compound[key].atom = toStr(reflect->GetUInt32(msg, fieldDesc));
-        }
-        break;
-      case google::protobuf::FieldDescriptor::TYPE_FIXED64:
-      case google::protobuf::FieldDescriptor::TYPE_UINT64:
-        if (fieldDesc->is_repeated()) {
-          for (int j = 0; j < reflect->FieldSize(msg, fieldDesc); j++) {
-            data.compound[key].array.push_back(Data(toStr(reflect->GetRepeatedUInt64(msg, fieldDesc, j))));
-          }
-        } else {
-          data.compound[key].atom = toStr(reflect->GetUInt64(msg, fieldDesc));
-        }
-        break;
-      case google::protobuf::FieldDescriptor::TYPE_FLOAT:
-        if (fieldDesc->is_repeated()) {
-          for (int j = 0; j < reflect->FieldSize(msg, fieldDesc); j++) {
-            data.compound[key].array.push_back(Data(toStr(reflect->GetRepeatedFloat(msg, fieldDesc, j))));
-          }
-        } else {
-          data.compound[key].atom = toStr(reflect->GetFloat(msg, fieldDesc));
-        }
-        break;
-      case google::protobuf::FieldDescriptor::TYPE_GROUP:
-        LOG(ERROR) << "TYPE_GROUP is unimplemented" << std::endl;
-        break;
-      case google::protobuf::FieldDescriptor::TYPE_INT32:
-      case google::protobuf::FieldDescriptor::TYPE_SINT32:
-      case google::protobuf::FieldDescriptor::TYPE_SFIXED32:
-        if (fieldDesc->is_repeated()) {
-          for (int j = 0; j < reflect->FieldSize(msg, fieldDesc); j++) {
-            data.compound[key].array.push_back(Data(toStr(reflect->GetRepeatedInt32(msg, fieldDesc, j))));
-          }
-        } else {
-          data.compound[key].atom = toStr(reflect->GetInt32(msg, fieldDesc));
-        }
-        break;
-      case google::protobuf::FieldDescriptor::TYPE_INT64:
-      case google::protobuf::FieldDescriptor::TYPE_SINT64:
-      case google::protobuf::FieldDescriptor::TYPE_SFIXED64:
-        if (fieldDesc->is_repeated()) {
-          for (int j = 0; j < reflect->FieldSize(msg, fieldDesc); j++) {
-            data.compound[key].array.push_back(Data(toStr(reflect->GetRepeatedInt64(msg, fieldDesc, j))));
-          }
-        } else {
-          data.compound[key].atom = toStr(reflect->GetInt64(msg, fieldDesc));
-        }
-        break;
-      case google::protobuf::FieldDescriptor::TYPE_MESSAGE:
-        if (fieldDesc->is_repeated()) {
-          for (int j = 0; j < reflect->FieldSize(msg, fieldDesc); j++) {
-            data.compound[key].array.push_back(Data());
-            protobufToData(data.compound[key].array.back(), reflect->GetRepeatedMessage(msg, fieldDesc, j));
-          }
-        } else {
-          protobufToData(data.compound[key], reflect->GetMessage(msg, fieldDesc));
-        }
-        break;
-    }
-  }
-  return true;
+	const google::protobuf::Descriptor* desc = msg.GetDescriptor();
+	const google::protobuf::Reflection* reflect = msg.GetReflection();
+
+	data.compound["type"] = Data(desc->name(), Data::VERBATIM);
+
+	for (int i = 0; i < desc->field_count(); i++) {
+		const google::protobuf::FieldDescriptor* fieldDesc = desc->field(i);
+		std::string key = fieldDesc->name();
+
+		if (!fieldDesc->is_repeated() && !reflect->HasField(msg, fieldDesc))
+			continue;
+
+		switch(fieldDesc->type()) {
+		case google::protobuf::FieldDescriptor::TYPE_BOOL:
+			if (fieldDesc->is_repeated()) {
+				for (int j = 0; j < reflect->FieldSize(msg, fieldDesc); j++) {
+					data.compound[key].array.push_back(Data(reflect->GetRepeatedBool(msg, fieldDesc, j) ? "true" : "false"));
+				}
+			} else {
+				data.compound[key].atom = (reflect->GetBool(msg, fieldDesc) ? "true" : "false");
+			}
+			break;
+		case google::protobuf::FieldDescriptor::TYPE_BYTES:
+		case google::protobuf::FieldDescriptor::TYPE_STRING:
+			if (fieldDesc->is_repeated()) {
+				for (int j = 0; j < reflect->FieldSize(msg, fieldDesc); j++) {
+					data.compound[key].array.push_back(Data(toStr(reflect->GetRepeatedString(msg, fieldDesc, j)), Data::VERBATIM));
+				}
+			} else {
+				data.compound[key].atom = toStr(reflect->GetString(msg, fieldDesc));
+				data.compound[key].type = Data::VERBATIM;
+			}
+			break;
+		case google::protobuf::FieldDescriptor::TYPE_DOUBLE:
+			if (fieldDesc->is_repeated()) {
+				for (int j = 0; j < reflect->FieldSize(msg, fieldDesc); j++) {
+					data.compound[key].array.push_back(Data(toStr(reflect->GetRepeatedDouble(msg, fieldDesc, j))));
+				}
+			} else {
+				data.compound[key].atom = toStr(reflect->GetDouble(msg, fieldDesc));
+			}
+			break;
+		case google::protobuf::FieldDescriptor::TYPE_ENUM:
+			LOG(ERROR) << "TYPE_ENUM is unimplemented" << std::endl;
+			break;
+		case google::protobuf::FieldDescriptor::TYPE_FIXED32:
+		case google::protobuf::FieldDescriptor::TYPE_UINT32:
+			if (fieldDesc->is_repeated()) {
+				for (int j = 0; j < reflect->FieldSize(msg, fieldDesc); j++) {
+					data.compound[key].array.push_back(Data(toStr(reflect->GetRepeatedUInt32(msg, fieldDesc, j))));
+				}
+			} else {
+				data.compound[key].atom = toStr(reflect->GetUInt32(msg, fieldDesc));
+			}
+			break;
+		case google::protobuf::FieldDescriptor::TYPE_FIXED64:
+		case google::protobuf::FieldDescriptor::TYPE_UINT64:
+			if (fieldDesc->is_repeated()) {
+				for (int j = 0; j < reflect->FieldSize(msg, fieldDesc); j++) {
+					data.compound[key].array.push_back(Data(toStr(reflect->GetRepeatedUInt64(msg, fieldDesc, j))));
+				}
+			} else {
+				data.compound[key].atom = toStr(reflect->GetUInt64(msg, fieldDesc));
+			}
+			break;
+		case google::protobuf::FieldDescriptor::TYPE_FLOAT:
+			if (fieldDesc->is_repeated()) {
+				for (int j = 0; j < reflect->FieldSize(msg, fieldDesc); j++) {
+					data.compound[key].array.push_back(Data(toStr(reflect->GetRepeatedFloat(msg, fieldDesc, j))));
+				}
+			} else {
+				data.compound[key].atom = toStr(reflect->GetFloat(msg, fieldDesc));
+			}
+			break;
+		case google::protobuf::FieldDescriptor::TYPE_GROUP:
+			LOG(ERROR) << "TYPE_GROUP is unimplemented" << std::endl;
+			break;
+		case google::protobuf::FieldDescriptor::TYPE_INT32:
+		case google::protobuf::FieldDescriptor::TYPE_SINT32:
+		case google::protobuf::FieldDescriptor::TYPE_SFIXED32:
+			if (fieldDesc->is_repeated()) {
+				for (int j = 0; j < reflect->FieldSize(msg, fieldDesc); j++) {
+					data.compound[key].array.push_back(Data(toStr(reflect->GetRepeatedInt32(msg, fieldDesc, j))));
+				}
+			} else {
+				data.compound[key].atom = toStr(reflect->GetInt32(msg, fieldDesc));
+			}
+			break;
+		case google::protobuf::FieldDescriptor::TYPE_INT64:
+		case google::protobuf::FieldDescriptor::TYPE_SINT64:
+		case google::protobuf::FieldDescriptor::TYPE_SFIXED64:
+			if (fieldDesc->is_repeated()) {
+				for (int j = 0; j < reflect->FieldSize(msg, fieldDesc); j++) {
+					data.compound[key].array.push_back(Data(toStr(reflect->GetRepeatedInt64(msg, fieldDesc, j))));
+				}
+			} else {
+				data.compound[key].atom = toStr(reflect->GetInt64(msg, fieldDesc));
+			}
+			break;
+		case google::protobuf::FieldDescriptor::TYPE_MESSAGE:
+			if (fieldDesc->is_repeated()) {
+				for (int j = 0; j < reflect->FieldSize(msg, fieldDesc); j++) {
+					data.compound[key].array.push_back(Data());
+					protobufToData(data.compound[key].array.back(), reflect->GetRepeatedMessage(msg, fieldDesc, j));
+				}
+			} else {
+				protobufToData(data.compound[key], reflect->GetMessage(msg, fieldDesc));
+			}
+			break;
+		}
+	}
+	return true;
 }
 
 bool UmundoInvoker::dataToProtobuf(google::protobuf::Message* msg, Data& data) {
-  const google::protobuf::Descriptor* desc = msg->GetDescriptor();
-  const google::protobuf::Reflection* reflect = msg->GetReflection();
-  
-  for (int i = 0; i < desc->field_count(); i++) {
-    const google::protobuf::FieldDescriptor* fieldDesc = desc->field(i);
-    std::string key = fieldDesc->name();
-    
-    if (data.compound.find(key) == data.compound.end()) {
-      if (fieldDesc->is_required()) {
-        LOG(ERROR) << "required field " << key << " not given in JSON";
-        return false;
-      }
-      continue;
-    }
-    
-    std::list<Data>::iterator arrayIter = data.compound[key].array.begin();
-    
-    switch(fieldDesc->type()) {
-      case google::protobuf::FieldDescriptor::TYPE_BOOL:
-        if (fieldDesc->is_repeated()) {
-          while(arrayIter != data.compound[key].array.end()) {
-            reflect->AddBool(msg, fieldDesc, arrayIter->atom.compare("false") == 0 ? false : true);
-            arrayIter++;
-          }
-        } else {
-          reflect->SetBool(msg, fieldDesc, (data.compound[key].atom.compare("false") == 0 ? false : true));
-        }
-        break;
-      case google::protobuf::FieldDescriptor::TYPE_BYTES:
-      case google::protobuf::FieldDescriptor::TYPE_STRING:
-        if (fieldDesc->is_repeated()) {
-          while(arrayIter != data.compound[key].array.end()) {
-            reflect->AddString(msg, fieldDesc, arrayIter->atom);
-            arrayIter++;
-          }
-        } else {
-          reflect->SetString(msg, fieldDesc, data.compound[key].atom);
-        }
-        break;
-      case google::protobuf::FieldDescriptor::TYPE_DOUBLE:
-        if (fieldDesc->is_repeated()) {
-          while(arrayIter != data.compound[key].array.end()) {
-            reflect->AddDouble(msg, fieldDesc, strTo<double>(arrayIter->atom));
-            arrayIter++;
-          }
-        } else {
-          reflect->SetDouble(msg, fieldDesc, strTo<double>(data.compound[key].atom));
-        }
-        break;
-      case google::protobuf::FieldDescriptor::TYPE_ENUM:
-        LOG(ERROR) << "TYPE_ENUM is unimplemented" << std::endl;
-        break;
-      case google::protobuf::FieldDescriptor::TYPE_FIXED32:
-      case google::protobuf::FieldDescriptor::TYPE_UINT32:
-        if (fieldDesc->is_repeated()) {
-          while(arrayIter != data.compound[key].array.end()) {
-            reflect->AddUInt32(msg, fieldDesc, strTo<uint32_t>(arrayIter->atom));
-            arrayIter++;
-          }
-        } else {
-          reflect->SetUInt32(msg, fieldDesc, strTo<uint32_t>(data.compound[key].atom));
-        }
-        break;
-      case google::protobuf::FieldDescriptor::TYPE_FIXED64:
-      case google::protobuf::FieldDescriptor::TYPE_UINT64:
-        if (fieldDesc->is_repeated()) {
-          while(arrayIter != data.compound[key].array.end()) {
-            reflect->AddUInt64(msg, fieldDesc, strTo<uint64_t>(arrayIter->atom));
-            arrayIter++;
-          }
-        } else {
-          reflect->SetUInt64(msg, fieldDesc, strTo<uint64_t>(data.compound[key].atom));
-        }
-        break;
-      case google::protobuf::FieldDescriptor::TYPE_FLOAT:
-        if (fieldDesc->is_repeated()) {
-          while(arrayIter != data.compound[key].array.end()) {
-            reflect->AddFloat(msg, fieldDesc, strTo<float>(arrayIter->atom));
-            arrayIter++;
-          }
-        } else {
-          reflect->SetFloat(msg, fieldDesc, strTo<float>(data.compound[key].atom));
-        }
-        break;
-      case google::protobuf::FieldDescriptor::TYPE_GROUP:
-        LOG(ERROR) << "TYPE_GROUP is unimplemented" << std::endl;
-        break;
-      case google::protobuf::FieldDescriptor::TYPE_INT32:
-      case google::protobuf::FieldDescriptor::TYPE_SINT32:
-      case google::protobuf::FieldDescriptor::TYPE_SFIXED32:
-        if (fieldDesc->is_repeated()) {
-          while(arrayIter != data.compound[key].array.end()) {
-            reflect->AddInt32(msg, fieldDesc, strTo<int32_t>(arrayIter->atom));
-            arrayIter++;
-          }
-        } else {
-          reflect->SetInt32(msg, fieldDesc, strTo<int32_t>(data.compound[key].atom));
-        }
-        break;
-      case google::protobuf::FieldDescriptor::TYPE_INT64:
-      case google::protobuf::FieldDescriptor::TYPE_SINT64:
-      case google::protobuf::FieldDescriptor::TYPE_SFIXED64:
-        if (fieldDesc->is_repeated()) {
-          while(arrayIter != data.compound[key].array.end()) {
-            reflect->AddInt64(msg, fieldDesc, strTo<int64_t>(arrayIter->atom));
-            arrayIter++;
-          }
-        } else {
-          reflect->SetInt64(msg, fieldDesc, strTo<int64_t>(data.compound[key].atom));
-        }
-        break;
-      case google::protobuf::FieldDescriptor::TYPE_MESSAGE:
-        if (fieldDesc->is_repeated()) {
-          while(arrayIter != data.compound[key].array.end()) {
-            dataToProtobuf(reflect->AddMessage(msg, fieldDesc), *arrayIter);
-            arrayIter++;
-          }
-        } else {
-          dataToProtobuf(reflect->MutableMessage(msg, fieldDesc), data.compound[key]);
-        }
-        break;
-    }
-  }
-  return true;
+	const google::protobuf::Descriptor* desc = msg->GetDescriptor();
+	const google::protobuf::Reflection* reflect = msg->GetReflection();
+
+	for (int i = 0; i < desc->field_count(); i++) {
+		const google::protobuf::FieldDescriptor* fieldDesc = desc->field(i);
+		std::string key = fieldDesc->name();
+
+		if (data.compound.find(key) == data.compound.end()) {
+			if (fieldDesc->is_required()) {
+				LOG(ERROR) << "required field " << key << " not given in JSON";
+				return false;
+			}
+			continue;
+		}
+
+		std::list<Data>::iterator arrayIter = data.compound[key].array.begin();
+
+		switch(fieldDesc->type()) {
+		case google::protobuf::FieldDescriptor::TYPE_BOOL:
+			if (fieldDesc->is_repeated()) {
+				while(arrayIter != data.compound[key].array.end()) {
+					reflect->AddBool(msg, fieldDesc, arrayIter->atom.compare("false") == 0 ? false : true);
+					arrayIter++;
+				}
+			} else {
+				reflect->SetBool(msg, fieldDesc, (data.compound[key].atom.compare("false") == 0 ? false : true));
+			}
+			break;
+		case google::protobuf::FieldDescriptor::TYPE_BYTES:
+		case google::protobuf::FieldDescriptor::TYPE_STRING:
+			if (fieldDesc->is_repeated()) {
+				while(arrayIter != data.compound[key].array.end()) {
+					reflect->AddString(msg, fieldDesc, arrayIter->atom);
+					arrayIter++;
+				}
+			} else {
+				reflect->SetString(msg, fieldDesc, data.compound[key].atom);
+			}
+			break;
+		case google::protobuf::FieldDescriptor::TYPE_DOUBLE:
+			if (fieldDesc->is_repeated()) {
+				while(arrayIter != data.compound[key].array.end()) {
+					reflect->AddDouble(msg, fieldDesc, strTo<double>(arrayIter->atom));
+					arrayIter++;
+				}
+			} else {
+				reflect->SetDouble(msg, fieldDesc, strTo<double>(data.compound[key].atom));
+			}
+			break;
+		case google::protobuf::FieldDescriptor::TYPE_ENUM:
+			LOG(ERROR) << "TYPE_ENUM is unimplemented" << std::endl;
+			break;
+		case google::protobuf::FieldDescriptor::TYPE_FIXED32:
+		case google::protobuf::FieldDescriptor::TYPE_UINT32:
+			if (fieldDesc->is_repeated()) {
+				while(arrayIter != data.compound[key].array.end()) {
+					reflect->AddUInt32(msg, fieldDesc, strTo<uint32_t>(arrayIter->atom));
+					arrayIter++;
+				}
+			} else {
+				reflect->SetUInt32(msg, fieldDesc, strTo<uint32_t>(data.compound[key].atom));
+			}
+			break;
+		case google::protobuf::FieldDescriptor::TYPE_FIXED64:
+		case google::protobuf::FieldDescriptor::TYPE_UINT64:
+			if (fieldDesc->is_repeated()) {
+				while(arrayIter != data.compound[key].array.end()) {
+					reflect->AddUInt64(msg, fieldDesc, strTo<uint64_t>(arrayIter->atom));
+					arrayIter++;
+				}
+			} else {
+				reflect->SetUInt64(msg, fieldDesc, strTo<uint64_t>(data.compound[key].atom));
+			}
+			break;
+		case google::protobuf::FieldDescriptor::TYPE_FLOAT:
+			if (fieldDesc->is_repeated()) {
+				while(arrayIter != data.compound[key].array.end()) {
+					reflect->AddFloat(msg, fieldDesc, strTo<float>(arrayIter->atom));
+					arrayIter++;
+				}
+			} else {
+				reflect->SetFloat(msg, fieldDesc, strTo<float>(data.compound[key].atom));
+			}
+			break;
+		case google::protobuf::FieldDescriptor::TYPE_GROUP:
+			LOG(ERROR) << "TYPE_GROUP is unimplemented" << std::endl;
+			break;
+		case google::protobuf::FieldDescriptor::TYPE_INT32:
+		case google::protobuf::FieldDescriptor::TYPE_SINT32:
+		case google::protobuf::FieldDescriptor::TYPE_SFIXED32:
+			if (fieldDesc->is_repeated()) {
+				while(arrayIter != data.compound[key].array.end()) {
+					reflect->AddInt32(msg, fieldDesc, strTo<int32_t>(arrayIter->atom));
+					arrayIter++;
+				}
+			} else {
+				reflect->SetInt32(msg, fieldDesc, strTo<int32_t>(data.compound[key].atom));
+			}
+			break;
+		case google::protobuf::FieldDescriptor::TYPE_INT64:
+		case google::protobuf::FieldDescriptor::TYPE_SINT64:
+		case google::protobuf::FieldDescriptor::TYPE_SFIXED64:
+			if (fieldDesc->is_repeated()) {
+				while(arrayIter != data.compound[key].array.end()) {
+					reflect->AddInt64(msg, fieldDesc, strTo<int64_t>(arrayIter->atom));
+					arrayIter++;
+				}
+			} else {
+				reflect->SetInt64(msg, fieldDesc, strTo<int64_t>(data.compound[key].atom));
+			}
+			break;
+		case google::protobuf::FieldDescriptor::TYPE_MESSAGE:
+			if (fieldDesc->is_repeated()) {
+				while(arrayIter != data.compound[key].array.end()) {
+					dataToProtobuf(reflect->AddMessage(msg, fieldDesc), *arrayIter);
+					arrayIter++;
+				}
+			} else {
+				dataToProtobuf(reflect->MutableMessage(msg, fieldDesc), data.compound[key]);
+			}
+			break;
+		}
+	}
+	return true;
 }
 
 }
\ No newline at end of file
diff --git a/src/uscxml/plugins/invoker/umundo/UmundoInvoker.h b/src/uscxml/plugins/invoker/umundo/UmundoInvoker.h
index 36a6217..72fcc9b 100644
--- a/src/uscxml/plugins/invoker/umundo/UmundoInvoker.h
+++ b/src/uscxml/plugins/invoker/umundo/UmundoInvoker.h
@@ -5,6 +5,7 @@
 #include <umundo/s11n.h>
 #include <umundo/rpc.h>
 #include <umundo/s11n/protobuf/PBSerializer.h>
+#include <uscxml/Interpreter.h>
 #include <google/protobuf/message.h>
 
 #ifdef BUILD_AS_PLUGINS
@@ -18,46 +19,46 @@ class Interpreter;
 class UmundoInvoker : public Invoker, public umundo::TypedReceiver, public umundo::ResultSet<umundo::ServiceDescription> {
 public:
 	UmundoInvoker();
-  virtual ~UmundoInvoker();
-  virtual Invoker* create(Interpreter* interpreter);
+	virtual ~UmundoInvoker();
+	virtual Invoker* create(Interpreter* interpreter);
 
-	virtual std::set<std::string> getNames() { 
+	virtual std::set<std::string> getNames() {
 		std::set<std::string> names;
 		names.insert("umundo");
 		names.insert("http://umundo.tk.informatik.tu-darmstadt.de/");
 		names.insert("http://umundo.tk.informatik.tu-darmstadt.de");
 		return names;
 	}
-	
-  virtual Data getDataModelVariables();
-  virtual void send(SendRequest& req);
-  virtual void cancel(const std::string sendId);
-  virtual void invoke(InvokeRequest& req);
-  virtual void sendToParent(SendRequest& req);
 
-  virtual void receive(void* object, umundo::Message* msg);
+	virtual Data getDataModelVariables();
+	virtual void send(SendRequest& req);
+	virtual void cancel(const std::string sendId);
+	virtual void invoke(InvokeRequest& req);
+	virtual void sendToParent(SendRequest& req);
 
-  virtual void added(umundo::ServiceDescription);
+	virtual void receive(void* object, umundo::Message* msg);
+
+	virtual void added(umundo::ServiceDescription);
 	virtual void removed(umundo::ServiceDescription);
 	virtual void changed(umundo::ServiceDescription);
-  
+
 protected:
-  std::string _invokeId;
-  bool _isService;
-  
-  bool dataToProtobuf(google::protobuf::Message* msg, Data& data);
-  bool protobufToData(Data& data, const google::protobuf::Message& msg);
-
-  umundo::TypedPublisher _pub;
-  umundo::TypedSubscriber _sub;
-  umundo::Node _node;
-    
-  umundo::ServiceFilter _svcFilter;
-  umundo::ServiceManager _svcMgr;
-  std::map<umundo::ServiceDescription, umundo::ServiceStub*> _svcs;
-  
-  static std::map<std::string, umundo::Node> _nodes;
-  static umundo::Node getNode(Interpreter* interpreter);
+	std::string _invokeId;
+	bool _isService;
+
+	bool dataToProtobuf(google::protobuf::Message* msg, Data& data);
+	bool protobufToData(Data& data, const google::protobuf::Message& msg);
+
+	umundo::TypedPublisher _pub;
+	umundo::TypedSubscriber _sub;
+	umundo::Node _node;
+
+	umundo::ServiceFilter _svcFilter;
+	umundo::ServiceManager _svcMgr;
+	std::map<umundo::ServiceDescription, umundo::ServiceStub*> _svcs;
+
+	static std::map<std::string, umundo::Node> _nodes;
+	static umundo::Node getNode(Interpreter* interpreter);
 };
 
 #ifdef BUILD_AS_PLUGINS