diff --git a/comment/lib.php b/comment/lib.php
index b1074f31b21..7c3c8853c1f 100644
--- a/comment/lib.php
+++ b/comment/lib.php
@@ -96,6 +96,8 @@ class comment {
     private static $comment_page = null;
     /** @var string comment itemid component in non-javascript UI */
     private static $comment_component = null;
+    /** @var stdClass comment paramaters for callback. */
+    protected $comment_param;
 
     /**
      * Construct function of comment class, initialise
diff --git a/comment/locallib.php b/comment/locallib.php
index 3e771cca166..d3b0004162b 100644
--- a/comment/locallib.php
+++ b/comment/locallib.php
@@ -27,6 +27,24 @@ class comment_manager {
     /** @var int The number of comments to display per page */
     private $perpage;
 
+    /** @var stdClass Course data. */
+    protected $course;
+
+    /** @var context|bool To store the context object or false if not found. */
+    protected $context;
+
+    /** @var stdClass Course module. */
+    protected $cm;
+
+    /** @var course_modinfo Module information for course, or null if resetting. */
+    protected $modinfo;
+
+    /** @var string plugin type. */
+    protected $plugintype;
+
+    /** @var string plugin name. */
+    protected $pluginname;
+
     /**
      * Constructs the comment_manage object
      */