diff --git a/generated_class_diagram.puml b/generated_class_diagram.puml
index 2b4544a..883dcab 100644
--- a/generated_class_diagram.puml
+++ b/generated_class_diagram.puml
@@ -2,24 +2,20 @@
  title org.texttechnologylab.project.gruppe_05_1
 package org.texttechnologylab.project.gruppe_05_1 {
 	class "Main" as org.texttechnologylab.project.gruppe_05_1.Main {
-	  + RESOURCES_DIR
+	  + UPLOAD_MEMBER_PHOTOS
+	  + FORCE_UPLOAD_MEMBERS
+	  + FORCE_UPLOAD_SPEECHES
 	  - xmlFactory
 	  - mongoFactory
-	  - speechParser
 	  + main()
 	}
 }
-org.texttechnologylab.project.gruppe_05_1.Main "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.domain.mdb.Mdb
-org.texttechnologylab.project.gruppe_05_1.Main "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.domain.mdb.MdbDocument
 org.texttechnologylab.project.gruppe_05_1.Main "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.nlp.NlpUtils
 org.texttechnologylab.project.gruppe_05_1.Main "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.nlp.XmiExtractor
 org.texttechnologylab.project.gruppe_05_1.Main "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.rest.RESTHandler
 org.texttechnologylab.project.gruppe_05_1.Main "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.util.Logger
 org.texttechnologylab.project.gruppe_05_1.Main "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.util.PPRUtils
-org.texttechnologylab.project.gruppe_05_1.Main "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.util.PropertiesUtils
-org.texttechnologylab.project.gruppe_05_1.Main "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.util.XmlUtils
 org.texttechnologylab.project.gruppe_05_1.Main "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.xml.FileObjectFactory
-org.texttechnologylab.project.gruppe_05_1.Main "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.xml.speeches.SpeechParser
 
 package org.texttechnologylab.project.gruppe_05_1.database {
 	class "SpeechIndexFactoryImpl" as org.texttechnologylab.project.gruppe_05_1.database.SpeechIndexFactoryImpl {
@@ -48,6 +44,7 @@ package org.texttechnologylab.project.gruppe_05_1.database {
 	class "MongoDBHandler" as org.texttechnologylab.project.gruppe_05_1.database.MongoDBHandler {
 	  + propertiesFileName
 	  + DEFAULT_ID_FIELD_NAME
+	  + MEMBER_IMAGES_DIR
 	  - mongoClient
 	  - database
 	  - mongoDatabase
@@ -58,52 +55,80 @@ package org.texttechnologylab.project.gruppe_05_1.database {
 	  - port
 	  - collection
 	  - databaseName
+	  - speakerCollection
 	  - speechesCollection
 	  - sessionsCollection
 	  - agendaItemsCollection
+	  - memberPhotoCollection
 	  - historyCollection
 	  + getDatabase()
+	  + collectionExists()
+	  + createCollectionIfNotExist()
+	  + createCollection()
+	  + createIndicesForSpeakerCollection()
+	  + createIndicesForSpeechCollection()
+	  + createOrTrancateCollection()
 	  + insertSession()
 	  + insertSessions()
 	  + insertAgendaItems()
 	  + insertSpeeches()
 	  + updateXmiData()
-	  + deleteAllDocuments()
-	  + bulkUpdateDocuments()
+	  + deleteSpeechRelatedDocuments()
+	  + bulkWriteNlpData()
+	  + checkAnalysisResultsField()
+	  + loadMemberImageFromFileById()
+	  + loadMemberImageFromFileByName()
+	  + uploadMemberPhoto()
+	  + uploadMemberPhotos()
 	  + close()
 	}
 }
+org.texttechnologylab.project.gruppe_05_1.database.MongoDBHandler "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.exceptions.ServerErrorException
+org.texttechnologylab.project.gruppe_05_1.database.MongoDBHandler "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.exceptions.SessionNotFoundException
 org.texttechnologylab.project.gruppe_05_1.database.MongoDBHandler "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.database.domainimp.speeches.AgendaItem_MongoDB_Impl
-org.texttechnologylab.project.gruppe_05_1.database.MongoDBHandler "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.database.domainimp.speeches.MemberOfParliament_MongoDB_Impl
 org.texttechnologylab.project.gruppe_05_1.database.MongoDBHandler "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.database.domainimp.speeches.Session_MongoDB_Impl
 org.texttechnologylab.project.gruppe_05_1.database.MongoDBHandler "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.database.domainimp.speeches.Speech_MongoDB_Impl
 org.texttechnologylab.project.gruppe_05_1.database.MongoDBHandler "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.util.Logger
+org.texttechnologylab.project.gruppe_05_1.database.MongoDBHandler "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.util.PPRUtils
 org.texttechnologylab.project.gruppe_05_1.database.MongoDBHandler "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.util.PropertiesUtils
 
 package org.texttechnologylab.project.gruppe_05_1.database {
 	class "MongoPprUtils" as org.texttechnologylab.project.gruppe_05_1.database.MongoPprUtils {
 	  + SPEAKER_COLLECTION_NAME
 	  + SPEECH_COLLECTION_NAME
+	  + SESSION_COLLECTION_NAME
+	  + AGENDA_ITEMS_COLLECTION_NAME
+	  + HISTORY_COLLECTION_NAME
 	  + PICTURES_COLLECTION_NAME
 	  + COMMENT_COLLECTION_NAME
 	  - speakerCollection
 	  - speechCollection
+	  - sessionCollection
+	  - agendaItemsCollection
 	  - picturesCollection
 	  - commentCollection
-	  + createSpeakerCollection()
-	  + createSpeechCollection()
-	  + createCommentCollection()
-	  + createPictureCollection()
+	  + createIndexForSpeakerCollection()
+	  + createIndexForSpeechCollection()
 	  + truncateSpeakerCollection()
 	  - readParlamentarierFromSpeaker()
 	  + getParlamentarierDetailsByID()
 	  - readParlamentarierDetailsFromSpeaker()
 	  - getMembership()
+	  + countSpeechesOfSpeaker()
+	  + getSessionDateTime()
+	  + getAgendaTitle()
+	  + getSpeechByKey()
 	}
 }
+org.texttechnologylab.project.gruppe_05_1.database.MongoPprUtils "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.database.domainimp.speeches.Speech_MongoDB_Impl
+org.texttechnologylab.project.gruppe_05_1.database.MongoPprUtils "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.domain.html.HtmlSpeech
 org.texttechnologylab.project.gruppe_05_1.database.MongoPprUtils "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.domain.html.Parlamentarier
 org.texttechnologylab.project.gruppe_05_1.database.MongoPprUtils "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.domain.html.ParlamentarierDetails
 org.texttechnologylab.project.gruppe_05_1.database.MongoPprUtils "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.domain.speaker.Membership
+org.texttechnologylab.project.gruppe_05_1.database.MongoPprUtils "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.domain.speech.SpeechMetaData
+org.texttechnologylab.project.gruppe_05_1.database.MongoPprUtils "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.util.GeneralUtils
+org.texttechnologylab.project.gruppe_05_1.database.MongoPprUtils "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.util.Logger
+org.texttechnologylab.project.gruppe_05_1.database.MongoPprUtils "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.xml.speeches.Interfaces.Speech
 
 package org.texttechnologylab.project.gruppe_05_1.database {
 	class "SpeechIndex" as org.texttechnologylab.project.gruppe_05_1.database.SpeechIndex {
@@ -251,9 +276,12 @@ org.texttechnologylab.project.gruppe_05_1.database.domainimp.speeches.Session_Mo
 
 package org.texttechnologylab.project.gruppe_05_1.database.domainimp.speeches {
 	class "Speech_MongoDB_Impl" as org.texttechnologylab.project.gruppe_05_1.database.domainimp.speeches.Speech_MongoDB_Impl {
+	  + getFullText()
+	  + toCas()
 	}
 }
 org.texttechnologylab.project.gruppe_05_1.database.domainimp.speeches.Speech_MongoDB_Impl "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.xml.speeches.Impls.Speech_File_Impl
+org.texttechnologylab.project.gruppe_05_1.database.domainimp.speeches.Speech_MongoDB_Impl "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.xml.speeches.Interfaces.Content
 org.texttechnologylab.project.gruppe_05_1.database.domainimp.speeches.Speech_MongoDB_Impl "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.xml.speeches.Interfaces.Speech
 
 package org.texttechnologylab.project.gruppe_05_1.rest {
@@ -264,6 +292,7 @@ package org.texttechnologylab.project.gruppe_05_1.rest {
 	}
 }
 org.texttechnologylab.project.gruppe_05_1.rest.JavalinConfig "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.util.GeneralUtils
+org.texttechnologylab.project.gruppe_05_1.rest.JavalinConfig "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.util.Logger
 org.texttechnologylab.project.gruppe_05_1.rest.JavalinConfig "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.util.PropertiesUtils
 
 package org.texttechnologylab.project.gruppe_05_1.rest {
@@ -272,9 +301,11 @@ package org.texttechnologylab.project.gruppe_05_1.rest {
 	  + startJavalin()
 	}
 }
+org.texttechnologylab.project.gruppe_05_1.rest.RESTHandler "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.util.Logger
 
 package org.texttechnologylab.project.gruppe_05_1.rest {
 	class "ParlamentarierController" as org.texttechnologylab.project.gruppe_05_1.rest.ParlamentarierController {
+	  - emptyList
 	  + getAllParlamentarier()
 	  + getParlamentarierDetails()
 	  + deleteAllParlamentarier()
@@ -283,18 +314,37 @@ package org.texttechnologylab.project.gruppe_05_1.rest {
 org.texttechnologylab.project.gruppe_05_1.rest.ParlamentarierController "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.domain.html.Parlamentarier
 org.texttechnologylab.project.gruppe_05_1.rest.ParlamentarierController "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.domain.html.ParlamentarierDetails
 org.texttechnologylab.project.gruppe_05_1.rest.ParlamentarierController "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.database.MongoPprUtils
+org.texttechnologylab.project.gruppe_05_1.rest.ParlamentarierController "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.util.Logger
 org.texttechnologylab.project.gruppe_05_1.rest.ParlamentarierController "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.util.PPRUtils
+org.texttechnologylab.project.gruppe_05_1.rest.ParlamentarierController "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.xml.speeches.Interfaces.Speech
+
+package org.texttechnologylab.project.gruppe_05_1.rest {
+	class "SpeechController" as org.texttechnologylab.project.gruppe_05_1.rest.SpeechController {
+	  + listSpeeches()
+	  + showSpeech()
+	}
+}
+org.texttechnologylab.project.gruppe_05_1.rest.SpeechController "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.database.MongoPprUtils
+org.texttechnologylab.project.gruppe_05_1.rest.SpeechController "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.domain.html.HtmlSpeech
+org.texttechnologylab.project.gruppe_05_1.rest.SpeechController "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.domain.html.ParlamentarierDetails
+org.texttechnologylab.project.gruppe_05_1.rest.SpeechController "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.domain.speech.SpeechMetaData
+org.texttechnologylab.project.gruppe_05_1.rest.SpeechController "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.xml.speeches.Interfaces.Speech
 
 package org.texttechnologylab.project.gruppe_05_1.nlp {
 	class "XmiExtractor" as org.texttechnologylab.project.gruppe_05_1.nlp.XmiExtractor {
-	  - 'static'
+	  - bulkOperations
+	  - mongoDBHandler
+	  - BATCH_SIZE
+	  - processedCount
 	  + extractAndUploadXmiData()
 	  - processXmiGzStream()
 	  - extractSpeechKeyFromFilename()
-	  - uploadToMongoDB()
-	  + getDatabase()
+	  - flushBatch()
+	  + main()
 	}
 }
+org.texttechnologylab.project.gruppe_05_1.nlp.XmiExtractor "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.database.MongoDBHandler
+org.texttechnologylab.project.gruppe_05_1.nlp.XmiExtractor "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.util.Logger
 
 package org.texttechnologylab.project.gruppe_05_1.nlp {
 	class "NlpUtils" as org.texttechnologylab.project.gruppe_05_1.nlp.NlpUtils {
@@ -311,6 +361,48 @@ package org.texttechnologylab.project.gruppe_05_1.nlp {
 	  - createSentenceInfo()
 	  - createNAmedEntities()
 	  - createSentimentInfo()
+	  + runRemoteDriver()
+	  + extractAnnotations()
+	}
+}
+org.texttechnologylab.project.gruppe_05_1.nlp.NlpUtils "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.database.MongoDBHandler
+org.texttechnologylab.project.gruppe_05_1.nlp.NlpUtils "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.database.domainimp.speeches.Speech_MongoDB_Impl
+org.texttechnologylab.project.gruppe_05_1.nlp.NlpUtils "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.util.Logger
+org.texttechnologylab.project.gruppe_05_1.nlp.NlpUtils "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.xml.speeches.Interfaces.Content
+org.texttechnologylab.project.gruppe_05_1.nlp.NlpUtils "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.xml.speeches.Interfaces.Speech
+
+package org.texttechnologylab.project.gruppe_05_1.exceptions {
+	class "SessionNotFoundException" as org.texttechnologylab.project.gruppe_05_1.exceptions.SessionNotFoundException {
+	}
+}
+
+package org.texttechnologylab.project.gruppe_05_1.exceptions {
+	class "MemberNotFoundException" as org.texttechnologylab.project.gruppe_05_1.exceptions.MemberNotFoundException {
+	}
+}
+
+package org.texttechnologylab.project.gruppe_05_1.exceptions {
+	class "AgendaItemNotFoundException" as org.texttechnologylab.project.gruppe_05_1.exceptions.AgendaItemNotFoundException {
+	}
+}
+
+package org.texttechnologylab.project.gruppe_05_1.exceptions {
+	class "FractionAlreadyExistsException" as org.texttechnologylab.project.gruppe_05_1.exceptions.FractionAlreadyExistsException {
+	}
+}
+
+package org.texttechnologylab.project.gruppe_05_1.exceptions {
+	class "ServerErrorException" as org.texttechnologylab.project.gruppe_05_1.exceptions.ServerErrorException {
+	}
+}
+
+package org.texttechnologylab.project.gruppe_05_1.exceptions {
+	class "SpeechNotFoundException" as org.texttechnologylab.project.gruppe_05_1.exceptions.SpeechNotFoundException {
+	}
+}
+
+package org.texttechnologylab.project.gruppe_05_1.exceptions {
+	class "FractionNotFoundException" as org.texttechnologylab.project.gruppe_05_1.exceptions.FractionNotFoundException {
 	}
 }
 
@@ -343,6 +435,7 @@ package org.texttechnologylab.project.gruppe_05_1.xml.mdb {
 }
 org.texttechnologylab.project.gruppe_05_1.xml.mdb.Institution_File_Impl "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.domain.mdb.Institution
 org.texttechnologylab.project.gruppe_05_1.xml.mdb.Institution_File_Impl "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.util.GeneralUtils
+org.texttechnologylab.project.gruppe_05_1.xml.mdb.Institution_File_Impl "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.util.Logger
 org.texttechnologylab.project.gruppe_05_1.xml.mdb.Institution_File_Impl "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.xml.XmlOperations
 
 package org.texttechnologylab.project.gruppe_05_1.xml.mdb {
@@ -362,6 +455,7 @@ package org.texttechnologylab.project.gruppe_05_1.xml.mdb {
 }
 org.texttechnologylab.project.gruppe_05_1.xml.mdb.MdbName_File_Impl "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.domain.mdb.MdbName
 org.texttechnologylab.project.gruppe_05_1.xml.mdb.MdbName_File_Impl "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.util.GeneralUtils
+org.texttechnologylab.project.gruppe_05_1.xml.mdb.MdbName_File_Impl "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.util.Logger
 org.texttechnologylab.project.gruppe_05_1.xml.mdb.MdbName_File_Impl "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.xml.XmlOperations
 
 package org.texttechnologylab.project.gruppe_05_1.xml.mdb {
@@ -371,6 +465,7 @@ package org.texttechnologylab.project.gruppe_05_1.xml.mdb {
 }
 org.texttechnologylab.project.gruppe_05_1.xml.mdb.BiografischeAngaben_File_Impl "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.domain.mdb.BiografischeAngaben
 org.texttechnologylab.project.gruppe_05_1.xml.mdb.BiografischeAngaben_File_Impl "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.util.GeneralUtils
+org.texttechnologylab.project.gruppe_05_1.xml.mdb.BiografischeAngaben_File_Impl "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.util.Logger
 org.texttechnologylab.project.gruppe_05_1.xml.mdb.BiografischeAngaben_File_Impl "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.xml.XmlOperations
 
 package org.texttechnologylab.project.gruppe_05_1.xml.mdb {
@@ -390,6 +485,7 @@ package org.texttechnologylab.project.gruppe_05_1.xml.mdb {
 	}
 }
 org.texttechnologylab.project.gruppe_05_1.xml.mdb.Wahlperiode_File_Impl "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.util.GeneralUtils
+org.texttechnologylab.project.gruppe_05_1.xml.mdb.Wahlperiode_File_Impl "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.util.Logger
 org.texttechnologylab.project.gruppe_05_1.xml.mdb.Wahlperiode_File_Impl "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.util.XmlUtils
 org.texttechnologylab.project.gruppe_05_1.xml.mdb.Wahlperiode_File_Impl "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.xml.XmlOperations
 
@@ -403,6 +499,7 @@ package org.texttechnologylab.project.gruppe_05_1.xml.speeches {
 	  - convertDocumentToFile()
 	}
 }
+org.texttechnologylab.project.gruppe_05_1.xml.speeches.SpeechParser "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.util.Logger
 org.texttechnologylab.project.gruppe_05_1.xml.speeches.SpeechParser "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.util.PPRUtils
 org.texttechnologylab.project.gruppe_05_1.xml.speeches.SpeechParser "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.xml.speeches.Interfaces.AgendaItem
 org.texttechnologylab.project.gruppe_05_1.xml.speeches.SpeechParser "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.xml.speeches.Interfaces.Session
@@ -608,6 +705,8 @@ package org.texttechnologylab.project.gruppe_05_1.xml.speeches.Impls {
 	  + getType()
 	  + addContent()
 	  + toHTML()
+	  + getFullText()
+	  + toCas()
 	}
 }
 org.texttechnologylab.project.gruppe_05_1.xml.speeches.Impls.Speech_File_Impl "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.xml.speeches.Interfaces.Content
@@ -739,6 +838,7 @@ package org.texttechnologylab.project.gruppe_05_1.util {
 	  + parseTime()
 	  + formatDate()
 	  + formatTime()
+	  + parseDateTime()
 	}
 }
 
@@ -783,7 +883,6 @@ package org.texttechnologylab.project.gruppe_05_1.util {
 	  + PARTEILOS_KUERZEL
 	  - processedProtocols
 	  + legislaturPeriode
-	  + ensureCollectionExist()
 	  + parlamentExplorerInit()
 	  + readPhotos()
 	  + readSpeechesAndComments()
@@ -803,6 +902,7 @@ org.texttechnologylab.project.gruppe_05_1.util.PPRUtils "1" <-- "1" org.texttech
 org.texttechnologylab.project.gruppe_05_1.util.PPRUtils "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.domain.speaker.Membership
 org.texttechnologylab.project.gruppe_05_1.util.PPRUtils "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.domain.speaker.Speaker
 org.texttechnologylab.project.gruppe_05_1.util.PPRUtils "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.xml.FileObjectFactory
+org.texttechnologylab.project.gruppe_05_1.util.PPRUtils "1" <-- "1" static
 
 package org.texttechnologylab.project.gruppe_05_1.domain {
 	enum "Gender" as org.texttechnologylab.project.gruppe_05_1.domain.Gender {
@@ -989,6 +1089,18 @@ package org.texttechnologylab.project.gruppe_05_1.domain.mdb {
 	}
 }
 
+package org.texttechnologylab.project.gruppe_05_1.domain.html {
+	enum "SpeechContent" as org.texttechnologylab.project.gruppe_05_1.domain.html.SpeechContent {
+	  + getType()
+	  + setType()
+	  + getContent()
+	  + setContent()
+	  + equals()
+	  + hashCode()
+	  + toString()
+	}
+}
+
 package org.texttechnologylab.project.gruppe_05_1.domain.html {
 	class "Parlamentarier" as org.texttechnologylab.project.gruppe_05_1.domain.html.Parlamentarier {
 	  + getId()
@@ -1051,6 +1163,23 @@ org.texttechnologylab.project.gruppe_05_1.domain.html.ParlamentarierDetails "1"
 org.texttechnologylab.project.gruppe_05_1.domain.html.ParlamentarierDetails "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.domain.speech.Speech
 org.texttechnologylab.project.gruppe_05_1.domain.html.ParlamentarierDetails "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.util.GeneralUtils
 
+package org.texttechnologylab.project.gruppe_05_1.domain.html {
+	class "HtmlSpeech" as org.texttechnologylab.project.gruppe_05_1.domain.html.HtmlSpeech {
+	  + getSpeechKey()
+	  + setSpeechKey()
+	  + getSpeakerName()
+	  + setSpeakerName()
+	  + getFraction()
+	  + setFraction()
+	  + setContent()
+	  + addContent()
+	  + equals()
+	  + hashCode()
+	  + toString()
+	}
+}
+org.texttechnologylab.project.gruppe_05_1.domain.html.HtmlSpeech "1" <-- "1" org.texttechnologylab.project.gruppe_05_1.database.MongoDBHandler
+
 package org.texttechnologylab.project.gruppe_05_1.domain.speaker {
 	class "Membership" as org.texttechnologylab.project.gruppe_05_1.domain.speaker.Membership {
 	  + getRole()
@@ -1110,6 +1239,28 @@ package org.texttechnologylab.project.gruppe_05_1.domain.speaker {
 	}
 }
 
+package org.texttechnologylab.project.gruppe_05_1.domain.speech {
+	class "SpeechMetaData" as org.texttechnologylab.project.gruppe_05_1.domain.speech.SpeechMetaData {
+	  + getSpeechKey()
+	  + setSpeechKey()
+	  + getSpeechId()
+	  + setSpeechId()
+	  + getSpeakerId()
+	  + setSpeakerId()
+	  + getSessionId()
+	  + setSessionId()
+	  + getDateTime()
+	  + setDateTime()
+	  + getDateTimeString()
+	  + setDateTimeString()
+	  + getAgendaTitle()
+	  + setAgendaTitle()
+	  + equals()
+	  + hashCode()
+	  + toString()
+	}
+}
+
 package org.texttechnologylab.project.gruppe_05_1.domain.speech {
 	class "Speech" as org.texttechnologylab.project.gruppe_05_1.domain.speech.Speech {
 	  + getId()
@@ -1197,39 +1348,4 @@ package org.texttechnologylab.project.gruppe_05_1.domain.speech {
 	}
 }
 
-package exceptions {
-	class "SessionNotFoundException" as exceptions.SessionNotFoundException {
-	}
-}
-
-package exceptions {
-	class "MemberNotFoundException" as exceptions.MemberNotFoundException {
-	}
-}
-
-package exceptions {
-	class "AgendaItemNotFoundException" as exceptions.AgendaItemNotFoundException {
-	}
-}
-
-package exceptions {
-	class "FractionAlreadyExistsException" as exceptions.FractionAlreadyExistsException {
-	}
-}
-
-package exceptions {
-	class "ServerErrorException" as exceptions.ServerErrorException {
-	}
-}
-
-package exceptions {
-	class "SpeechNotFoundException" as exceptions.SpeechNotFoundException {
-	}
-}
-
-package exceptions {
-	class "FractionNotFoundException" as exceptions.FractionNotFoundException {
-	}
-}
-
 @enduml