diff --git a/src/main/resources/log4j.properties b/src/main/resources/log4j.properties
index 71a8d03..9bd7ad2 100644
--- a/src/main/resources/log4j.properties
+++ b/src/main/resources/log4j.properties
@@ -1,36 +1,39 @@
-## logger file can be used with
-
 # log4j.rootLogger = ERROR, stdout
 
-# Spans:
-#log4j.logger.de.ids_mannheim.korap.query.spans.ElementSpans = TRACE, stdout
-#log4j.logger.de.ids_mannheim.korap.query.spans.AttributeSpans = TRACE, stdout
-#log4j.logger.de.ids_mannheim.korap.query.spans.ElementAttributeSpans = TRACE, stdout
-#log4j.logger.de.ids_mannheim.korap.query.spans.KorapTermSpan = TRACE, stdout
-#log4j.logger.de.ids_mannheim.korap.query.spans.WithinSpans = TRACE, stdout
-#log4j.logger.de.ids_mannheim.korap.query.SpanNextQuery = TRACE, stdout
-#log4j.logger.de.ids_mannheim.korap.query.spans.NextSpans = TRACE, stdout
-#log4j.logger.de.ids_mannheim.korap.query.spans.SimpleSpans = TRACE, stdout
-#log4j.logger.de.ids_mannheim.korap.query.spans.ClassSpans = TRACE, stdout
-#log4j.logger.de.ids_mannheim.korap.query.spans.MatchModifyClassSpans = TRACE, stdout
-#log4j.logger.de.ids_mannheim.korap.query.spans.MatchSpans = TRACE, stdout
+# Queries:
+# log4j.logger.de.ids_mannheim.korap.query.SpanNextQuery = TRACE, stdout
 
-# Wrapper
-# log4j.logger.de.ids_mannheim.korap.KorapQuery = TRACE, stdout
+# Spans:
+# log4j.logger.de.ids_mannheim.korap.query.spans.ElementSpans = TRACE, stdout
+# log4j.logger.de.ids_mannheim.korap.query.spans.AttributeSpans = TRACE, stdout
+# log4j.logger.de.ids_mannheim.korap.query.spans.ElementAttributeSpans = TRACE, stdout
+# log4j.logger.de.ids_mannheim.korap.query.spans.KorapTermSpan = TRACE, stdout
+# log4j.logger.de.ids_mannheim.korap.query.spans.WithinSpans = TRACE, stdout
+# log4j.logger.de.ids_mannheim.korap.query.spans.NextSpans = TRACE, stdout
+# log4j.logger.de.ids_mannheim.korap.query.spans.SimpleSpans = TRACE, stdout
+# log4j.logger.de.ids_mannheim.korap.query.spans.ClassSpans = TRACE, stdout
+# log4j.logger.de.ids_mannheim.korap.query.spans.FocusSpans = TRACE, stdout
+# log4j.logger.de.ids_mannheim.korap.query.spans.MatchSpans = TRACE, stdout
+
+# Wrappers:
+# log4j.logger.de.ids_mannheim.korap.KrillQuery = TRACE, stdout
 # log4j.logger.de.ids_mannheim.korap.query.wrap.SpanSequenceQueryWrapper = TRACE, stdout
 
-# Collections
-#log4j.logger.de.ids_mannheim.korap.KorapFilter = TRACE, stdout
-# log4j.logger.de.ids_mannheim.korap.KorapCollection = TRACE, stdout
+# Collections:
+# log4j.logger.de.ids_mannheim.korap.collection.Filter = TRACE, stdout
+# log4j.logger.de.ids_mannheim.korap.KrillCollection = TRACE, stdout
 
-# Results:
-#log4j.logger.de.ids_mannheim.korap.KorapIndex = TRACE, stdout
-#log4j.logger.de.ids_mannheim.korap.KorapNode = TRACE, stdout
-#log4j.logger.de.ids_mannheim.korap.KorapMatch = TRACE, stdout
-#log4j.logger.de.ids_mannheim.korap.index.PositionsToOffset = TRACE, stdout
+# Responses:
+# log4j.logger.de.ids_mannheim.korap.server.Node = TRACE, stdout
+# log4j.logger.de.ids_mannheim.korap.response.Match = TRACE, stdout
 
-#log4j.logger.de.ids_mannheim.korap.index.TestSegmentIndex = TRACE, stdout
-#log4j.logger.de.ids_mannheim.korap.analysis.MultiTermTokenStream = TRACE, stdout
+# Index:
+# log4j.logger.de.ids_mannheim.korap.KrillIndex = TRACE, stdout
+# log4j.logger.de.ids_mannheim.korap.index.PositionsToOffset = TRACE, stdout
+# log4j.logger.de.ids_mannheim.korap.index.MultiTermTokenStream = TRACE, stdout
+
+# Tests:
+# log4j.logger.de.ids_mannheim.korap.index.TestSegmentIndex = TRACE, stdout
 
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout