diff -r d70ea23682aa -r fb717cfbfea1 src/lib/INIContentHandler.h
--- a/src/lib/INIContentHandler.h	Sun Nov 22 19:22:25 2020 +0100
+++ b/src/lib/INIContentHandler.h	Mon Nov 23 16:25:57 2020 +0100
@@ -25,26 +25,39 @@
 	public:
 		int64_t eventNumber = -1;
 		int64_t lineNumber = -1;
-		std::string comment;
 	};
 
 	class SectionStartEvent : public Event {
 	public:
+		std::string comment;
 		std::string name;
 	};
 
 	class EntryEvent : public Event {
 	public:
+		std::string comment;
 		std::string key;
 		std::string subKey;
 		std::string fullKey;
 		std::string value;
 	};
 
+	class CommentEvent : public Event {
+	public:
+		std::string comment;
+	};
+
+	class WhitespaceEvent : public Event {
+	public:
+		std::string whitespace;
+	};
+
 	virtual ~INIContentHandler() = default;
 	virtual void startDocument() = 0;
 	virtual void endDocument() = 0;
 	virtual void startSection(const SectionStartEvent& event) = 0;
 	virtual void endSection() = 0;
 	virtual void entry(const EntryEvent& event) = 0;
-};
\ No newline at end of file
+	virtual void comment(const CommentEvent& event) = 0;
+	virtual void whitespace(const WhitespaceEvent& event) = 0;
+};