diff --git a/src/argouml-app/src/org/argouml/application/helpers/ApplicationVersion.java b/src/argouml-app/src/org/argouml/application/helpers/ApplicationVersion.java
index 241b5aa..d857d5c 100644
--- a/src/argouml-app/src/org/argouml/application/helpers/ApplicationVersion.java
+++ b/src/argouml-app/src/org/argouml/application/helpers/ApplicationVersion.java
@@ -45,7 +45,9 @@ public class ApplicationVersion {
     public static String getVersion() {
         return version;
     }
-    
+
+    //#if defined(COGNITIVE)    
+    //@#$LPS-LOGGING:GranularityType:Method    
     /**
      * Retrieve the online HTML manual of ArgoUML for a critic. 
      * You need to append the critic class-name.
@@ -65,7 +67,8 @@ public static String getManualForCritic() {
             + stableVersion
             + "-single/argomanual.html#critics.";
     }
-
+    //#endif
+    
     /**
      * Retrieve the URL of the online manual of ArgoUML.
      * 
diff --git a/src/argouml-app/src/org/argouml/kernel/MemberList.java b/src/argouml-app/src/org/argouml/kernel/MemberList.java
index 32a5ced..6c6b117 100644
--- a/src/argouml-app/src/org/argouml/kernel/MemberList.java
+++ b/src/argouml-app/src/org/argouml/kernel/MemberList.java
@@ -86,8 +86,11 @@ class MemberList implements List<ProjectMember> {
 
     private List<ProjectMemberDiagram> diagramMembers = 
         new ArrayList<ProjectMemberDiagram>(10);
-
+    
+    //#if defined(COGNITIVE)    
+    //@#$LPS-LOGGING:GranularityType:Field
     private AbstractProjectMember todoList;
+    //#endif
     private AbstractProjectMember profileConfiguration;
 
     /**
@@ -139,15 +142,20 @@ public synchronized boolean remove(Object member) {
         if (model == member) {
             model = null;
             return true;
-        } else if (todoList == member) {
+        } 
+        //#if defined(COGNITIVE)
+        //@#$LPS-COGNITIVE:GranularityType:Statement
+        else if (todoList == member) {
             //#if defined(LOGGING)
             //@#$LPS-LOGGING:GranularityType:Statement
             //@#$LPS-LOGGING:Localization:NestedStatement
             LOG.info("Removing todo list");
             //#endif
-            setTodoList(null);
+            setTodoList(null);            
             return true;
-        } else if (profileConfiguration == member) {
+        } 
+        //#endif
+        else if (profileConfiguration == member) {
             //#if defined(LOGGING)
             //@#$LPS-LOGGING:GranularityType:Statement
             //@#$LPS-LOGGING:Localization:NestedStatement
@@ -195,9 +203,12 @@ private List<ProjectMember> buildOrderedMemberList() {
             temp.add(model);
         }
         temp.addAll(diagramMembers);
+        //#if defined(COGNITIVE)    
+        //@#$LPS-LOGGING:GranularityType:Statement
         if (todoList != null) {
             temp.add(todoList);
         }
+        //#endif
         return temp;
     }
     
@@ -222,9 +233,12 @@ public synchronized int size() {
         if (model != null) {
             ++size;
         }
+        //#if defined(COGNITIVE)
+        //@#$LPS-COGNITIVE:GranularityType:Statement
         if (todoList != null) {
             ++size;
         }
+        //#endif
         if (profileConfiguration != null) {
             ++size;
         }
@@ -232,9 +246,12 @@ public synchronized int size() {
     }
 
     public synchronized boolean contains(Object member) {
+        //#if defined(COGNITIVE)    
+        //@#$LPS-LOGGING:GranularityType:Statement
         if (todoList == member) {
             return true;
         }
+        //#endif
         if (model == member) {
             return true;
         }
@@ -253,9 +270,12 @@ public synchronized void clear() {
         if (model != null) {
             model.remove();
         }
+        //#if defined(COGNITIVE)    
+        //@#$LPS-LOGGING:GranularityType:Statement
         if (todoList != null) {
             todoList.remove();
         }
+        //#endif
         if (profileConfiguration != null) {
             profileConfiguration.remove();
         }
@@ -275,11 +295,17 @@ public synchronized ProjectMember get(int i) {
         }
 
         if (i == diagramMembers.size()) {
+            //#if defined(COGNITIVE)    
+            //@#$LPS-LOGGING:GranularityType:Statement
             if (todoList != null) {
                 return todoList;
             } else {
+            //#endif
                 return profileConfiguration;
+            //#if defined(COGNITIVE)    
+            //@#$LPS-LOGGING:GranularityType:Statement
             }
+            //#endif
         }
         
         if (i == (diagramMembers.size() + 1)) {
@@ -302,15 +328,20 @@ public synchronized ProjectMember[] toArray() {
         for (ProjectMemberDiagram d : diagramMembers) {
             temp[pos++] = d;
         }
+        //#if defined(COGNITIVE)
+        //@#$LPS-COGNITIVE:GranularityType:Statement
         if (todoList != null) {
             temp[pos++] = todoList;
         }
+        //#endif
         if (profileConfiguration != null) {
             temp[pos++] = profileConfiguration;
         }
         return temp;
     }
-
+    
+    //#if defined(COGNITIVE)    
+    //@#$LPS-LOGGING:GranularityType:Method
     private void setTodoList(AbstractProjectMember member) {
         //#if defined(LOGGING)
         //@#$LPS-LOGGING:GranularityType:Statement
@@ -319,6 +350,7 @@ private void setTodoList(AbstractProjectMember member) {
         //#endif
         todoList = member;
     }
+    //#endif
 
     public <T> T[] toArray(T[] a) {
         throw new UnsupportedOperationException();
diff --git a/src/argouml-app/src/org/argouml/persistence/OffenderXMLHelper.java b/src/argouml-app/src/org/argouml/persistence/OffenderXMLHelper.java
index 586c930..c1bba64 100644
--- a/src/argouml-app/src/org/argouml/persistence/OffenderXMLHelper.java
+++ b/src/argouml-app/src/org/argouml/persistence/OffenderXMLHelper.java
@@ -1,3 +1,6 @@
+//#if defined(COGNITIVE)
+//@#$LPS-COGNITIVE:GranularityType:Class
+
 // $Id$
 // Copyright (c) 1996-2006 The Regents of the University of California. All
 // Rights Reserved. Permission to use, copy, modify, and distribute this
@@ -66,3 +69,4 @@ public String getOffender() {
     }
 }
 
+//#endif
\ No newline at end of file
diff --git a/src/argouml-app/src/org/argouml/persistence/TodoTokenTable.java b/src/argouml-app/src/org/argouml/persistence/TodoTokenTable.java
index 425a965..fa97892 100644
--- a/src/argouml-app/src/org/argouml/persistence/TodoTokenTable.java
+++ b/src/argouml-app/src/org/argouml/persistence/TodoTokenTable.java
@@ -1,3 +1,6 @@
+//#if defined(COGNITIVE)
+//@#$LPS-COGNITIVE:GranularityType:Class
+
 // $Id$
 // Copyright (c) 1996-2006 The Regents of the University of California. All
 // Rights Reserved. Permission to use, copy, modify, and distribute this
@@ -107,3 +110,4 @@ protected void setupTokens() {
     }
 }
 
+//#endif
\ No newline at end of file
diff --git a/src/argouml-app/src/org/argouml/persistence/XmiFilePersister.java b/src/argouml-app/src/org/argouml/persistence/XmiFilePersister.java
index d428ef0..b6678f4 100644
--- a/src/argouml-app/src/org/argouml/persistence/XmiFilePersister.java
+++ b/src/argouml-app/src/org/argouml/persistence/XmiFilePersister.java
@@ -69,8 +69,10 @@ class XmiFilePersister extends AbstractFilePersister
     //#endif
     private List<String> pgmlStrings = new ArrayList<String>();
     
+    //#if defined(COGNITIVE)    
+    //@#$LPS-LOGGING:GranularityType:Field
     private String todoString;
-    
+    //#endif
     private String argoString;
     
     /**
diff --git a/src/argouml-app/src/org/argouml/ui/cmd/GenericArgoMenuBar.java b/src/argouml-app/src/org/argouml/ui/cmd/GenericArgoMenuBar.java
index a676340..c6abcf0 100644
--- a/src/argouml-app/src/org/argouml/ui/cmd/GenericArgoMenuBar.java
+++ b/src/argouml-app/src/org/argouml/ui/cmd/GenericArgoMenuBar.java
@@ -219,12 +219,13 @@ public class GenericArgoMenuBar extends JMenuBar implements
      * This should be invoked automatically when importing sources.
      */
     private ArgoJMenu arrange;
-
+    //#if defined(COGNITIVE)    
+    //@#$LPS-LOGGING:GranularityType:Field   
     /**
      * The critique menu.
      */
     private ArgoJMenu critique;
-
+    //#endif
     /**
      * It needs it. Currently there is only system information and an about
      * text. Hyperlinking to online docs at argouml.org is considered to be a
diff --git a/src/argouml-app/src/org/argouml/ui/cmd/ShortcutMgr.java b/src/argouml-app/src/org/argouml/ui/cmd/ShortcutMgr.java
index 8665297..c1fc3a1 100644
--- a/src/argouml-app/src/org/argouml/ui/cmd/ShortcutMgr.java
+++ b/src/argouml-app/src/org/argouml/ui/cmd/ShortcutMgr.java
@@ -276,10 +276,11 @@ public class ShortcutMgr {
 
     /** Action key for open goals */
     public static final String ACTION_OPEN_GOALS = "openGoals";
-
+    //#if defined(COGNITIVE)    
+    //@#$LPS-LOGGING:GranularityType:Field   
     /** Action key for open critics */
     public static final String ACTION_OPEN_CRITICS = "openCritics";
-
+    //#endif
     /** Action key for help */
     public static final String ACTION_HELP = "help";