diff --git a/panda-framework/src/main/java/org/panda_lang/framework/design/interpreter/parser/ContextComponent.java b/panda-framework/src/main/java/org/panda_lang/framework/design/interpreter/parser/ContextComponent.java
index 5e7ea644b..74c2a018a 100644
--- a/panda-framework/src/main/java/org/panda_lang/framework/design/interpreter/parser/ContextComponent.java
+++ b/panda-framework/src/main/java/org/panda_lang/framework/design/interpreter/parser/ContextComponent.java
@@ -21,6 +21,11 @@
 import java.util.HashMap;
 import java.util.Map;
 
+/**
+ * Represents components used in the {@link org.panda_lang.framework.design.interpreter.parser.Context}
+ *
+ * @param <T> type of stored value
+ */
 public class ContextComponent<T> extends Component<T> {
 
     private static final Map<String, ContextComponent<?>> COMPONENTS = new HashMap<>();
diff --git a/panda-framework/src/main/java/org/panda_lang/framework/design/interpreter/parser/ContextParser.java b/panda-framework/src/main/java/org/panda_lang/framework/design/interpreter/parser/ContextParser.java
index e14ef11f5..8773214ed 100644
--- a/panda-framework/src/main/java/org/panda_lang/framework/design/interpreter/parser/ContextParser.java
+++ b/panda-framework/src/main/java/org/panda_lang/framework/design/interpreter/parser/ContextParser.java
@@ -16,6 +16,11 @@
 
 package org.panda_lang.framework.design.interpreter.parser;
 
+/**
+ * Represents parsers supported by pipelines
+ *
+ * @param <T> type of result
+ */
 public interface ContextParser<T> extends Parser {
 
     /**
diff --git a/panda-framework/src/main/java/org/panda_lang/framework/design/interpreter/parser/ParserDebug.java b/panda-framework/src/main/java/org/panda_lang/framework/design/interpreter/parser/ParserDebug.java
deleted file mode 100644
index 2ed854a9a..000000000
--- a/panda-framework/src/main/java/org/panda_lang/framework/design/interpreter/parser/ParserDebug.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (c) 2015-2019 Dzikoysk
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.panda_lang.framework.design.interpreter.parser;
-
-public interface ParserDebug {
-
-    boolean isTailingEnabled();
-
-}
diff --git a/panda-framework/src/main/java/org/panda_lang/framework/design/interpreter/parser/ParserFailure.java b/panda-framework/src/main/java/org/panda_lang/framework/design/interpreter/parser/ParserFailure.java
index 484bccd8c..9f4c0dc91 100644
--- a/panda-framework/src/main/java/org/panda_lang/framework/design/interpreter/parser/ParserFailure.java
+++ b/panda-framework/src/main/java/org/panda_lang/framework/design/interpreter/parser/ParserFailure.java
@@ -18,8 +18,16 @@
 
 import org.panda_lang.framework.design.Failure;
 
+/**
+ * Represents errors associated with parsers
+ */
 public interface ParserFailure extends Failure {
 
+    /**
+     * Get associated context
+     *
+     * @return the context
+     */
     Context getContext();
 
 }
diff --git a/panda-framework/src/main/java/org/panda_lang/framework/design/interpreter/parser/ParserRepresentation.java b/panda-framework/src/main/java/org/panda_lang/framework/design/interpreter/parser/ParserRepresentation.java
index 621a5d167..f3d37b9af 100644
--- a/panda-framework/src/main/java/org/panda_lang/framework/design/interpreter/parser/ParserRepresentation.java
+++ b/panda-framework/src/main/java/org/panda_lang/framework/design/interpreter/parser/ParserRepresentation.java
@@ -18,6 +18,11 @@
 
 import org.panda_lang.framework.design.interpreter.parser.pipeline.Handler;
 
+/**
+ * Parser container
+ *
+ * @param <P> type of stored parser
+ */
 public interface ParserRepresentation<P> {
 
     /**
diff --git a/panda-framework/src/main/java/org/panda_lang/framework/design/interpreter/parser/SourceParser.java b/panda-framework/src/main/java/org/panda_lang/framework/design/interpreter/parser/SourceParser.java
index 25774895b..a32e5df31 100644
--- a/panda-framework/src/main/java/org/panda_lang/framework/design/interpreter/parser/SourceParser.java
+++ b/panda-framework/src/main/java/org/panda_lang/framework/design/interpreter/parser/SourceParser.java
@@ -18,6 +18,11 @@
 
 import org.panda_lang.framework.design.interpreter.token.Snippet;
 
+/**
+ * Similar to {@link org.panda_lang.framework.design.interpreter.parser.ContextParser}, but with custom source
+ *
+ * @param <T> type of result
+ */
 public interface SourceParser<T> extends Parser {
 
     /**