diff --git a/votable/VOTD.cpp b/votable/VOTD.cpp
index 329a0f0b5fae76e718f4d6be321b3d1b99512ad1..d30c8c1e73157e080092e539c6fd58521b825a59 100644
--- a/votable/VOTD.cpp
+++ b/votable/VOTD.cpp
@@ -20,24 +20,27 @@
 
 #include "VOTD.h"
 
-Fidelity::Common::VOTD::VOTD()
+namespace Fidelity {
+	namespace Common {
+
+VOTD::VOTD()
 {
 	initAttributes();
 }
 
-Fidelity::Common::VOTD::VOTD(QString content)
+VOTD::VOTD(QString content)
 {
 	m_Content = content;
 	initAttributes();
 }
 
-Fidelity::Common::VOTD::~VOTD()
+VOTD::~VOTD()
 {
 
 }
 
 
-bool Fidelity::Common::VOTD::buildXml(QDomElement* parent)
+bool VOTD::buildXml(QDomElement* parent)
 {
 	parent->setTagName("TD");
 
@@ -54,25 +57,27 @@ bool Fidelity::Common::VOTD::buildXml(QDomElement* parent)
 }
 
 
-void Fidelity::Common::VOTD::setEncoding(QString new_var)
+void VOTD::setEncoding(QString new_var)
 {
 	m_Encoding = new_var;
 }
 
-QString Fidelity::Common::VOTD::Encoding()
+QString VOTD::Encoding()
 {
 	return m_Encoding;
 }
 
-void Fidelity::Common::VOTD::setContent(QString new_var)
+void VOTD::setContent(QString new_var)
 {
 	m_Content = new_var;
 }
 
-QString Fidelity::Common::VOTD::Content()
+QString VOTD::Content()
 {
 	return m_Content;
 }
 
-void Fidelity::Common::VOTD::initAttributes()
+void VOTD::initAttributes()
 {}
+
+}}
diff --git a/votable/VOTD.h b/votable/VOTD.h
index 3cec9cefa60e7fa139a3d674dc143b49ab52d3bd..8b7ac780ac028ba8ed295ae5a0b966188c1cb7f6 100644
--- a/votable/VOTD.h
+++ b/votable/VOTD.h
@@ -21,6 +21,7 @@
 #ifndef VOTD_H
 #define VOTD_H
 
+#include <QObject>
 #include <QString>
 #include <QDomElement>
 
@@ -34,7 +35,7 @@ namespace Fidelity {
  * See this URL for the latest definition: http://www.ivoa.net/Documents/latest/VOT.html
  * For the time being only XML and binary based output is supported...
  */
-class VOTD
+class VOTD : public QObject
 {
 
 public: