1 files changed, 24 insertions, 5 deletions
diff --git a/Swiften/Entity/Entity.cpp b/Swiften/Entity/Entity.cpp
index da2ecaf..44f9fbf 100644
--- a/Swiften/Entity/Entity.cpp
+++ b/Swiften/Entity/Entity.cpp
@@ -4,28 +4,47 @@
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
-#include "Swiften/Entity/Entity.h"
+#include <Swiften/Entity/Entity.h>
+
+#include <Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.h>
+#include <Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.h>
+
 
 namespace Swift {
 
+Entity::Entity() {
+	payloadParserFactories = new FullPayloadParserFactoryCollection();
+	payloadSerializers = new FullPayloadSerializerCollection();
+}
+
 Entity::~Entity() {
+	delete payloadSerializers;
+	delete payloadParserFactories;
 }
 
 
 void Entity::addPayloadParserFactory(PayloadParserFactory* payloadParserFactory) {
-	payloadParserFactories.addFactory(payloadParserFactory);
+	payloadParserFactories->addFactory(payloadParserFactory);
 }
 
 void Entity::removePayloadParserFactory(PayloadParserFactory* payloadParserFactory) {
-	payloadParserFactories.removeFactory(payloadParserFactory);
+	payloadParserFactories->removeFactory(payloadParserFactory);
 }
 
 void Entity::addPayloadSerializer(PayloadSerializer* payloadSerializer) {
-	payloadSerializers.addSerializer(payloadSerializer);
+	payloadSerializers->addSerializer(payloadSerializer);
 }
 
 void Entity::removePayloadSerializer(PayloadSerializer* payloadSerializer) {
-	payloadSerializers.removeSerializer(payloadSerializer);
+	payloadSerializers->removeSerializer(payloadSerializer);
+}
+
+PayloadParserFactoryCollection* Entity::getPayloadParserFactories() {
+	return payloadParserFactories;
+}
+
+PayloadSerializerCollection* Entity::getPayloadSerializers() {
+	return payloadSerializers;
 }
 
 }