diff --git a/eclipse-tools/responseTime-analyzer/plugins/org.eclipse.app4mc.gsoc_rta/src/org/eclipse/app4mc/gsoc_rta/SharedConsts.java b/eclipse-tools/responseTime-analyzer/plugins/org.eclipse.app4mc.gsoc_rta/src/org/eclipse/app4mc/gsoc_rta/SharedConsts.java
index db46713..98bff5a 100644
--- a/eclipse-tools/responseTime-analyzer/plugins/org.eclipse.app4mc.gsoc_rta/src/org/eclipse/app4mc/gsoc_rta/SharedConsts.java
+++ b/eclipse-tools/responseTime-analyzer/plugins/org.eclipse.app4mc.gsoc_rta/src/org/eclipse/app4mc/gsoc_rta/SharedConsts.java
@@ -19,11 +19,22 @@
 
 	public static int RUNTIMESEC = 2 * 60 * 60;
 	public static final String SINGLE_CORE_MODEL = "model-input/SingleTCs/SingleTCs.amxmi";
+	/**
+	 * This model is derived from WATERS 2019 challenge, which has 14 tasks and 7
+	 * cores (6 CPUs and 1GPU) I changed the preemptive type (preemption in task's
+	 * properties) of several tasks to emulate different preemptive environment,
+	 * this model is used to test the validity of NPandPRTA functions
+	 */
+
 	public static final String FHDO_MODELZNP = "model-input/ChallengeModelNP.amxmi";
+	/**
+	 * This model is derived from WATERS 2019 challenge, which has 14 tasks and 7
+	 * cores (6 CPUs and 1GPU) The only different is there are several semaphore
+	 * inside task to create task's critical section. This model is used to validate
+	 * Blocking class methods
+	 */
 	public static final String FHDO_MODELZ = "model-input/ChallengeModelZero.amxmi";
 
-
-	
 	/*-----------Measurement Configuration--------------–*/
 	public static TimeType timeType = TimeType.WCET;
 	public static boolean onlyWrittenLabelsCE = true;
@@ -35,20 +46,31 @@
 	public static boolean levelIBusyPeriod = false;
 	public static TS_DERIV tsDeriv = TS_DERIV.TSxPrio;
 	public static OPT_TYPE optimize = OPT_TYPE.RESPONSETIMESUM;
-	public static final boolean considerGlobalBlocking = false;
-	public static final boolean considerLocalBlocking = false;
 	public static boolean offsetCPURTA = true;
 	public static final boolean zeroHigh = true;
 	/*-----------End Measur. Configuration--------------–*/
 
 	/*----------- Mapping Solutions ---------------------*/
+	/**
+	 * Please note that these mapping arrays are used as an indicator of which core
+	 * task's is assigned, the location of each element represent task, and the
+	 * value represent core.
+	 * 
+	 * I.e. {0,2,3,1,1,2} : first task is assigned to first core of the model, 2nd
+	 * task is assigned to 3rd core, 3rd task is assigned to 4th core and so on
+	 * 
+	 * These mappings are used explicitly for model derived from WATERS2019
+	 * challenge which have 14 tasks and 7 cores, hence 14 elements and value ranged
+	 * from 0 to 6
+	 * 
+	 * The mapping below come from my team's personal repository where we tried to
+	 * find optimum response time for WATERS 2019 model
+	 */
 	public static final int[] rtsoptimized = new int[] { 2, 3, 5, 3, 2, 1, 5, 5, 2, 1, 0, 6, 4, 6 };
 	public static final int[] lboptimized = new int[] { 2, 1, 3, 3, 3, 0, 1, 5, 2, 1, 6, 5, 4, 6 };
 	public static final int[] tcoptimized = new int[] { 2, 4, 5, 1, 2, 0, 5, 0, 3, 4, 1, 6, 3, 6 };
 	public static final int[] earlyValid = new int[] { 5, 4, 1, 0, 1, 0, 1, 0, 3, 0, 6, 3, 2, 6 };
 
-	
-
 	public enum OPT_TYPE {
 		TASKCHAINS, RESPONSETIMESUM, LOADBALANCING
 	}
diff --git a/eclipse-tools/responseTime-analyzer/plugins/org.eclipse.app4mc.gsoc_rta/src/org/eclipse/app4mc/gsoc_rta/test/BlockingTest.java b/eclipse-tools/responseTime-analyzer/plugins/org.eclipse.app4mc.gsoc_rta/src/org/eclipse/app4mc/gsoc_rta/test/BlockingTest.java
index d2a66a5..bb31513 100644
--- a/eclipse-tools/responseTime-analyzer/plugins/org.eclipse.app4mc.gsoc_rta/src/org/eclipse/app4mc/gsoc_rta/test/BlockingTest.java
+++ b/eclipse-tools/responseTime-analyzer/plugins/org.eclipse.app4mc.gsoc_rta/src/org/eclipse/app4mc/gsoc_rta/test/BlockingTest.java
@@ -1,3 +1,17 @@
+/*******************************************************************************
+ * Copyright (c) 2020 Dortmund University of Applied Sciences and Arts.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors: The Bao Bui
+ *     FH Dortmund - initial API and implementation
+ *******************************************************************************/
+
 package org.eclipse.app4mc.gsoc_rta.test;
 
 import static org.junit.Assert.assertEquals;