[EPLv2] Update copyright messages in all relevant files

This is the second commit to ensure that we conform to EPLv2. In this
commit, the copyright messages of all relevant files have been changed
to reflect the new license. At the same time, the copyright messages
now include the current revision year, an SPDX-License-Identifier,
and list Chalmers | University of Gothenburg as contributors of
additional features and new API.

This commit addresses Bug 546480.
diff --git a/bundles/org.eclipse.capra.core/build.properties b/bundles/org.eclipse.capra.core/build.properties
index 0bfff55..a197515 100644
--- a/bundles/org.eclipse.capra.core/build.properties
+++ b/bundles/org.eclipse.capra.core/build.properties
@@ -1,12 +1,15 @@
 ###############################################################################
-# Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+# Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #  
-#   Contributors:
+# SPDX-License-Identifier: EPL-2.0
+#  
+# Contributors:
 #      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+#      Chalmers | University of Gothenburg - additional features, updated API
 ###############################################################################
 source.. = src/
 output.. = bin/
diff --git a/bundles/org.eclipse.capra.core/plugin.xml b/bundles/org.eclipse.capra.core/plugin.xml
index ff224ee..65571b5 100644
--- a/bundles/org.eclipse.capra.core/plugin.xml
+++ b/bundles/org.eclipse.capra.core/plugin.xml
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.4"?>
 <!--
-    Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+    Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
     All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
+    are made available under the terms of the Eclipse Public License v2.0
     which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
+    http://www.eclipse.org/legal/epl-v20.html
      
-      Contributors:
+    SPDX-License-Identifier: EPL-2.0
+     
+    Contributors:
          Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+         Chalmers | University of Gothenburg - additional features, updated API
  -->
 
 <plugin>
diff --git a/bundles/org.eclipse.capra.core/pom.xml b/bundles/org.eclipse.capra.core/pom.xml
index d72efbf..c9404f3 100644
--- a/bundles/org.eclipse.capra.core/pom.xml
+++ b/bundles/org.eclipse.capra.core/pom.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+    Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
     All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
+    are made available under the terms of the Eclipse Public License v2.0
     which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
+    http://www.eclipse.org/legal/epl-v20.html
      
-      Contributors:
+    SPDX-License-Identifier: EPL-2.0
+     
+    Contributors:
          Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+         Chalmers | University of Gothenburg - additional features, updated API
  -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/adapters/AbstractArtifactMetaModelAdapter.java b/bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/adapters/AbstractArtifactMetaModelAdapter.java
index c0b2e3c..0d61635 100644
--- a/bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/adapters/AbstractArtifactMetaModelAdapter.java
+++ b/bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/adapters/AbstractArtifactMetaModelAdapter.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2017 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
+ * http://www.eclipse.org/legal/epl-v20.html
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ *  
  * Contributors:
- *    Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.core.adapters;
 
diff --git a/bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/adapters/AbstractMetaModelAdapter.java b/bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/adapters/AbstractMetaModelAdapter.java
index af23697..a321bd8 100644
--- a/bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/adapters/AbstractMetaModelAdapter.java
+++ b/bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/adapters/AbstractMetaModelAdapter.java
@@ -1,3 +1,16 @@
+/*******************************************************************************
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v20.html
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
+ *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
+ *******************************************************************************/
 package org.eclipse.capra.core.adapters;
 
 import java.util.ArrayList;
diff --git a/bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/adapters/ArtifactMetaModelAdapter.java b/bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/adapters/ArtifactMetaModelAdapter.java
index 95c161f..6f2e640 100644
--- a/bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/adapters/ArtifactMetaModelAdapter.java
+++ b/bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/adapters/ArtifactMetaModelAdapter.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- *   Contributors:
+ * http://www.eclipse.org/legal/epl-v20.html
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
  *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.core.adapters;
 
diff --git a/bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/adapters/Connection.java b/bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/adapters/Connection.java
index 1c16ece..8d5699d 100644
--- a/bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/adapters/Connection.java
+++ b/bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/adapters/Connection.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *  
- *   Contributors:
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
  *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.core.adapters;
 
diff --git a/bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/adapters/TraceMetaModelAdapter.java b/bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/adapters/TraceMetaModelAdapter.java
index 2bfe5ef..0e2c08a 100644
--- a/bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/adapters/TraceMetaModelAdapter.java
+++ b/bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/adapters/TraceMetaModelAdapter.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *  
- *   Contributors:
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
  *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.core.adapters;
 
diff --git a/bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/adapters/TracePersistenceAdapter.java b/bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/adapters/TracePersistenceAdapter.java
index 4d21221..b6a2f71 100644
--- a/bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/adapters/TracePersistenceAdapter.java
+++ b/bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/adapters/TracePersistenceAdapter.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *  
- *   Contributors:
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
  *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.core.adapters;
 
diff --git a/bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/handlers/AbstractArtifactHandler.java b/bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/handlers/AbstractArtifactHandler.java
index d21af8b..1d91cd7 100644
--- a/bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/handlers/AbstractArtifactHandler.java
+++ b/bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/handlers/AbstractArtifactHandler.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2017 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
+ * http://www.eclipse.org/legal/epl-v20.html
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ *  
  * Contributors:
- *    Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.core.handlers;
 
diff --git a/bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/handlers/AnnotationException.java b/bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/handlers/AnnotationException.java
index c9c3e34..e99ae59 100644
--- a/bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/handlers/AnnotationException.java
+++ b/bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/handlers/AnnotationException.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
+ * http://www.eclipse.org/legal/epl-v20.html
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ *  
  * Contributors:
- *    Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.core.handlers;
 
diff --git a/bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/handlers/IAnnotateArtifact.java b/bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/handlers/IAnnotateArtifact.java
index 39962d1..fc4a601 100644
--- a/bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/handlers/IAnnotateArtifact.java
+++ b/bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/handlers/IAnnotateArtifact.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- *   Contributors:
+ * http://www.eclipse.org/legal/epl-v20.html
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
  *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.core.handlers;
 
diff --git a/bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/handlers/IArtifactHandler.java b/bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/handlers/IArtifactHandler.java
index 1f3fd02..b76913c 100644
--- a/bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/handlers/IArtifactHandler.java
+++ b/bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/handlers/IArtifactHandler.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2017 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
+ * http://www.eclipse.org/legal/epl-v20.html
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ *  
  * Contributors:
- *    Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.core.handlers;
 
diff --git a/bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/handlers/IArtifactUnpacker.java b/bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/handlers/IArtifactUnpacker.java
index 43a3d92..82d4d42 100644
--- a/bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/handlers/IArtifactUnpacker.java
+++ b/bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/handlers/IArtifactUnpacker.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2017 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
+ * http://www.eclipse.org/legal/epl-v20.html
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ *  
  * Contributors:
- *    Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.core.handlers;
 
diff --git a/bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/handlers/PriorityHandler.java b/bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/handlers/PriorityHandler.java
index 0844ff2..7a1a781 100644
--- a/bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/handlers/PriorityHandler.java
+++ b/bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/handlers/PriorityHandler.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *  
- *   Contributors:
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
  *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.core.handlers;
 
diff --git a/bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/helpers/ArtifactHelper.java b/bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/helpers/ArtifactHelper.java
index e0c31ec..caf2623 100644
--- a/bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/helpers/ArtifactHelper.java
+++ b/bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/helpers/ArtifactHelper.java
@@ -1,3 +1,16 @@
+/*******************************************************************************
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v20.html
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
+ *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
+ *******************************************************************************/
 package org.eclipse.capra.core.helpers;
 
 import static java.util.stream.Collectors.toList;
diff --git a/bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/helpers/EMFHelper.java b/bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/helpers/EMFHelper.java
index b809f2f..858c083 100644
--- a/bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/helpers/EMFHelper.java
+++ b/bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/helpers/EMFHelper.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *  
- *   Contributors:
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
  *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.core.helpers;
 
diff --git a/bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/helpers/ExtensionPointHelper.java b/bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/helpers/ExtensionPointHelper.java
index 43ec176..f4fa195 100644
--- a/bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/helpers/ExtensionPointHelper.java
+++ b/bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/helpers/ExtensionPointHelper.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- *   Contributors:
+ * http://www.eclipse.org/legal/epl-v20.html
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
  *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.core.helpers;
 
diff --git a/bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/helpers/TraceHelper.java b/bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/helpers/TraceHelper.java
index b37ee24..03a8068 100644
--- a/bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/helpers/TraceHelper.java
+++ b/bundles/org.eclipse.capra.core/src/org/eclipse/capra/core/helpers/TraceHelper.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2017 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
+ * http://www.eclipse.org/legal/epl-v20.html
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ *  
  * Contributors:
- *    Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.core.helpers;
 
diff --git a/bundles/org.eclipse.capra.documentation/build.properties b/bundles/org.eclipse.capra.documentation/build.properties
index a35e429..6bf5e2f 100644
--- a/bundles/org.eclipse.capra.documentation/build.properties
+++ b/bundles/org.eclipse.capra.documentation/build.properties
@@ -1,12 +1,15 @@
 ###############################################################################
-# Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+# Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #  
-#   Contributors:
+# SPDX-License-Identifier: EPL-2.0
+#  
+# Contributors:
 #      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+#      Chalmers | University of Gothenburg - additional features, updated API
 ###############################################################################
 source.. = docu/,\
 		   images/
diff --git a/bundles/org.eclipse.capra.documentation/docu/capraDocumentation-toc.xml b/bundles/org.eclipse.capra.documentation/docu/capraDocumentation-toc.xml
index d7a0e43..a021803 100644
--- a/bundles/org.eclipse.capra.documentation/docu/capraDocumentation-toc.xml
+++ b/bundles/org.eclipse.capra.documentation/docu/capraDocumentation-toc.xml
@@ -1,4 +1,17 @@
 <?xml version='1.0' encoding='utf-8' ?>
+<!--
+    Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License v2.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v20.html
+     
+    SPDX-License-Identifier: EPL-2.0
+     
+    Contributors:
+         Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+         Chalmers | University of Gothenburg - additional features, updated API
+ -->
 <toc topic="docu/capraDocumentation.html" label="capraDocumentation">
 	<topic href="docu/capraDocumentation.html" label="Capra Help Contents">
 		<topic href="docu/capraDocumentation.html#user-guide" label="User Guide">
diff --git a/bundles/org.eclipse.capra.documentation/plugin.xml b/bundles/org.eclipse.capra.documentation/plugin.xml
index 7cd1503..8aaa04d 100644
--- a/bundles/org.eclipse.capra.documentation/plugin.xml
+++ b/bundles/org.eclipse.capra.documentation/plugin.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License v2.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v20.html
+     
+    SPDX-License-Identifier: EPL-2.0
+     
+    Contributors:
+         Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+         Chalmers | University of Gothenburg - additional features, updated API
+ -->
 <?eclipse version="3.4"?>
 <plugin>
    <extension
diff --git a/bundles/org.eclipse.capra.documentation/pom.xml b/bundles/org.eclipse.capra.documentation/pom.xml
index 02492d2..c696cb6 100644
--- a/bundles/org.eclipse.capra.documentation/pom.xml
+++ b/bundles/org.eclipse.capra.documentation/pom.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+    Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
     All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
+    are made available under the terms of the Eclipse Public License v2.0
     which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
+    http://www.eclipse.org/legal/epl-v20.html
      
-      Contributors:
+    SPDX-License-Identifier: EPL-2.0
+     
+    Contributors:
          Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+         Chalmers | University of Gothenburg - additional features, updated API
  -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/bundles/org.eclipse.capra.generic.artifactmodel/build.properties b/bundles/org.eclipse.capra.generic.artifactmodel/build.properties
index ff972dc..067c1cb 100644
--- a/bundles/org.eclipse.capra.generic.artifactmodel/build.properties
+++ b/bundles/org.eclipse.capra.generic.artifactmodel/build.properties
@@ -1,12 +1,15 @@
 ###############################################################################
-# Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+# Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #  
-#   Contributors:
+# SPDX-License-Identifier: EPL-2.0
+#  
+# Contributors:
 #      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+#      Chalmers | University of Gothenburg - additional features, updated API
 ###############################################################################
 #
 bin.includes = .,\
diff --git a/bundles/org.eclipse.capra.generic.artifactmodel/plugin.properties b/bundles/org.eclipse.capra.generic.artifactmodel/plugin.properties
index f6d6e87..31e28c5 100644
--- a/bundles/org.eclipse.capra.generic.artifactmodel/plugin.properties
+++ b/bundles/org.eclipse.capra.generic.artifactmodel/plugin.properties
@@ -1,3 +1,16 @@
+###############################################################################

+# Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.

+# All rights reserved. This program and the accompanying materials

+# are made available under the terms of the Eclipse Public License v2.0

+# which accompanies this distribution, and is available at

+# http://www.eclipse.org/legal/epl-v20.html

+#  

+# SPDX-License-Identifier: EPL-2.0

+#  

+# Contributors:

+#      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation

+#      Chalmers | University of Gothenburg - additional features, updated API

+###############################################################################

 #

 

 pluginName = Artifactmodel Model

diff --git a/bundles/org.eclipse.capra.generic.artifactmodel/plugin.xml b/bundles/org.eclipse.capra.generic.artifactmodel/plugin.xml
index 50214d9..848c493 100644
--- a/bundles/org.eclipse.capra.generic.artifactmodel/plugin.xml
+++ b/bundles/org.eclipse.capra.generic.artifactmodel/plugin.xml
@@ -2,6 +2,20 @@
 <?eclipse version="3.0"?>
 
 <!--
+    Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License v2.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v20.html
+     
+    SPDX-License-Identifier: EPL-2.0
+     
+    Contributors:
+         Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+         Chalmers | University of Gothenburg - additional features, updated API
+ -->
+
+<!--
 -->
 
 <plugin>
diff --git a/bundles/org.eclipse.capra.generic.artifactmodel/pom.xml b/bundles/org.eclipse.capra.generic.artifactmodel/pom.xml
index 7f92f5b..f735ffb 100644
--- a/bundles/org.eclipse.capra.generic.artifactmodel/pom.xml
+++ b/bundles/org.eclipse.capra.generic.artifactmodel/pom.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+    Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
     All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
+    are made available under the terms of the Eclipse Public License v2.0
     which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
+    http://www.eclipse.org/legal/epl-v20.html
      
-      Contributors:
+    SPDX-License-Identifier: EPL-2.0
+     
+    Contributors:
          Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+         Chalmers | University of Gothenburg - additional features, updated API
  -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/bundles/org.eclipse.capra.generic.artifactmodel/src/org/eclipse/capra/generic/artifactmodel/GenericArtifactMetaModelAdapter.java b/bundles/org.eclipse.capra.generic.artifactmodel/src/org/eclipse/capra/generic/artifactmodel/GenericArtifactMetaModelAdapter.java
index a7773c2..3b61a57 100644
--- a/bundles/org.eclipse.capra.generic.artifactmodel/src/org/eclipse/capra/generic/artifactmodel/GenericArtifactMetaModelAdapter.java
+++ b/bundles/org.eclipse.capra.generic.artifactmodel/src/org/eclipse/capra/generic/artifactmodel/GenericArtifactMetaModelAdapter.java
@@ -1,13 +1,16 @@
 package org.eclipse.capra.generic.artifactmodel;
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- *   Contributors:
+ * http://www.eclipse.org/legal/epl-v20.html
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
  *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 
 import java.util.List;
diff --git a/bundles/org.eclipse.capra.generic.persistence/build.properties b/bundles/org.eclipse.capra.generic.persistence/build.properties
index 9fc85e9..af525cf 100644
--- a/bundles/org.eclipse.capra.generic.persistence/build.properties
+++ b/bundles/org.eclipse.capra.generic.persistence/build.properties
@@ -1,12 +1,15 @@
 ###############################################################################
-# Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+# Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #  
-#   Contributors:
+# SPDX-License-Identifier: EPL-2.0
+#  
+# Contributors:
 #      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+#      Chalmers | University of Gothenburg - additional features, updated API
 ###############################################################################
 source.. = src/
 bin.includes = META-INF/,\
diff --git a/bundles/org.eclipse.capra.generic.persistence/plugin.xml b/bundles/org.eclipse.capra.generic.persistence/plugin.xml
index 23f4e3f..04afdb2 100644
--- a/bundles/org.eclipse.capra.generic.persistence/plugin.xml
+++ b/bundles/org.eclipse.capra.generic.persistence/plugin.xml
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.4"?>
 <!--
-    Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+    Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
     All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
+    are made available under the terms of the Eclipse Public License v2.0
     which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
+    http://www.eclipse.org/legal/epl-v20.html
      
-      Contributors:
+    SPDX-License-Identifier: EPL-2.0
+     
+    Contributors:
          Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+         Chalmers | University of Gothenburg - additional features, updated API
  -->
 
 <plugin>
diff --git a/bundles/org.eclipse.capra.generic.persistence/pom.xml b/bundles/org.eclipse.capra.generic.persistence/pom.xml
index 06decab..b086119 100644
--- a/bundles/org.eclipse.capra.generic.persistence/pom.xml
+++ b/bundles/org.eclipse.capra.generic.persistence/pom.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+    Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
     All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
+    are made available under the terms of the Eclipse Public License v2.0
     which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
+    http://www.eclipse.org/legal/epl-v20.html
      
-      Contributors:
+    SPDX-License-Identifier: EPL-2.0
+     
+    Contributors:
          Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+         Chalmers | University of Gothenburg - additional features, updated API
  -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/bundles/org.eclipse.capra.generic.persistence/src/org/eclipse/capra/generic/persistance/TracePersistenceAdapter.java b/bundles/org.eclipse.capra.generic.persistence/src/org/eclipse/capra/generic/persistance/TracePersistenceAdapter.java
index dd40686..80ea702 100644
--- a/bundles/org.eclipse.capra.generic.persistence/src/org/eclipse/capra/generic/persistance/TracePersistenceAdapter.java
+++ b/bundles/org.eclipse.capra.generic.persistence/src/org/eclipse/capra/generic/persistance/TracePersistenceAdapter.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *  
- *   Contributors:
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
  *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.generic.persistance;
 
diff --git a/bundles/org.eclipse.capra.generic.priority/build.properties b/bundles/org.eclipse.capra.generic.priority/build.properties
index 9fc85e9..af525cf 100644
--- a/bundles/org.eclipse.capra.generic.priority/build.properties
+++ b/bundles/org.eclipse.capra.generic.priority/build.properties
@@ -1,12 +1,15 @@
 ###############################################################################
-# Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+# Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #  
-#   Contributors:
+# SPDX-License-Identifier: EPL-2.0
+#  
+# Contributors:
 #      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+#      Chalmers | University of Gothenburg - additional features, updated API
 ###############################################################################
 source.. = src/
 bin.includes = META-INF/,\
diff --git a/bundles/org.eclipse.capra.generic.priority/plugin.xml b/bundles/org.eclipse.capra.generic.priority/plugin.xml
index 1400dd5..4efd2fe 100644
--- a/bundles/org.eclipse.capra.generic.priority/plugin.xml
+++ b/bundles/org.eclipse.capra.generic.priority/plugin.xml
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.4"?>
 <!--
-    Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+    Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
     All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
+    are made available under the terms of the Eclipse Public License v2.0
     which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
+    http://www.eclipse.org/legal/epl-v20.html
      
-      Contributors:
+    SPDX-License-Identifier: EPL-2.0
+     
+    Contributors:
          Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+         Chalmers | University of Gothenburg - additional features, updated API
  -->
 
 <plugin>
diff --git a/bundles/org.eclipse.capra.generic.priority/pom.xml b/bundles/org.eclipse.capra.generic.priority/pom.xml
index efcdb2b..551f58f 100644
--- a/bundles/org.eclipse.capra.generic.priority/pom.xml
+++ b/bundles/org.eclipse.capra.generic.priority/pom.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+    Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
     All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
+    are made available under the terms of the Eclipse Public License v2.0
     which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
+    http://www.eclipse.org/legal/epl-v20.html
      
-      Contributors:
+    SPDX-License-Identifier: EPL-2.0
+     
+    Contributors:
          Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+         Chalmers | University of Gothenburg - additional features, updated API
  -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/bundles/org.eclipse.capra.generic.priority/src/org/eclipse/capra/generic/priority/DefaultPriorityHandler.java b/bundles/org.eclipse.capra.generic.priority/src/org/eclipse/capra/generic/priority/DefaultPriorityHandler.java
index b31b7bc..e205c8a 100644
--- a/bundles/org.eclipse.capra.generic.priority/src/org/eclipse/capra/generic/priority/DefaultPriorityHandler.java
+++ b/bundles/org.eclipse.capra.generic.priority/src/org/eclipse/capra/generic/priority/DefaultPriorityHandler.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- *   Contributors:
+ * http://www.eclipse.org/legal/epl-v20.html
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
  *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.generic.priority;
 
diff --git a/bundles/org.eclipse.capra.generic.tracemodels/build.properties b/bundles/org.eclipse.capra.generic.tracemodels/build.properties
index 5eb3dbc..316bad4 100644
--- a/bundles/org.eclipse.capra.generic.tracemodels/build.properties
+++ b/bundles/org.eclipse.capra.generic.tracemodels/build.properties
@@ -1,12 +1,15 @@
 ###############################################################################
-# Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+# Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #  
-#   Contributors:
+# SPDX-License-Identifier: EPL-2.0
+#  
+# Contributors:
 #      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+#      Chalmers | University of Gothenburg - additional features, updated API
 ###############################################################################
 #
 bin.includes = .,\
diff --git a/bundles/org.eclipse.capra.generic.tracemodels/plugin.properties b/bundles/org.eclipse.capra.generic.tracemodels/plugin.properties
index 789ac06..799009b 100644
--- a/bundles/org.eclipse.capra.generic.tracemodels/plugin.properties
+++ b/bundles/org.eclipse.capra.generic.tracemodels/plugin.properties
@@ -1,3 +1,16 @@
+###############################################################################

+# Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.

+# All rights reserved. This program and the accompanying materials

+# are made available under the terms of the Eclipse Public License v2.0

+# which accompanies this distribution, and is available at

+# http://www.eclipse.org/legal/epl-v20.html

+#  

+# SPDX-License-Identifier: EPL-2.0

+#  

+# Contributors:

+#      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation

+#      Chalmers | University of Gothenburg - additional features, updated API

+###############################################################################

 #

 

 pluginName = GenericArtifactMetaModel Model

diff --git a/bundles/org.eclipse.capra.generic.tracemodels/plugin.xml b/bundles/org.eclipse.capra.generic.tracemodels/plugin.xml
index 07f2d1b..681c2f0 100644
--- a/bundles/org.eclipse.capra.generic.tracemodels/plugin.xml
+++ b/bundles/org.eclipse.capra.generic.tracemodels/plugin.xml
@@ -2,14 +2,17 @@
 <?eclipse version="3.0"?>
 
 <!--
-    Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+    Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
     All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
+    are made available under the terms of the Eclipse Public License v2.0
     which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
+    http://www.eclipse.org/legal/epl-v20.html
      
-      Contributors:
+    SPDX-License-Identifier: EPL-2.0
+     
+    Contributors:
          Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+         Chalmers | University of Gothenburg - additional features, updated API
  -->
 
 <!--
diff --git a/bundles/org.eclipse.capra.generic.tracemodels/pom.xml b/bundles/org.eclipse.capra.generic.tracemodels/pom.xml
index 8cfbba2..683f95b 100644
--- a/bundles/org.eclipse.capra.generic.tracemodels/pom.xml
+++ b/bundles/org.eclipse.capra.generic.tracemodels/pom.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+    Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
     All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
+    are made available under the terms of the Eclipse Public License v2.0
     which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
+    http://www.eclipse.org/legal/epl-v20.html
      
-      Contributors:
+    SPDX-License-Identifier: EPL-2.0
+     
+    Contributors:
          Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+         Chalmers | University of Gothenburg - additional features, updated API
  -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/bundles/org.eclipse.capra.generic.tracemodels/src/org/eclipse/capra/generic/tracemodels/GenericMetaModelAdapter.java b/bundles/org.eclipse.capra.generic.tracemodels/src/org/eclipse/capra/generic/tracemodels/GenericMetaModelAdapter.java
index 26d4cbc..f33ccac 100644
--- a/bundles/org.eclipse.capra.generic.tracemodels/src/org/eclipse/capra/generic/tracemodels/GenericMetaModelAdapter.java
+++ b/bundles/org.eclipse.capra.generic.tracemodels/src/org/eclipse/capra/generic/tracemodels/GenericMetaModelAdapter.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *  
- *   Contributors:
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
  *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.generic.tracemodels;
 
diff --git a/bundles/org.eclipse.capra.handler.cdt/build.properties b/bundles/org.eclipse.capra.handler.cdt/build.properties
index 3960f18..5a2e446 100644
--- a/bundles/org.eclipse.capra.handler.cdt/build.properties
+++ b/bundles/org.eclipse.capra.handler.cdt/build.properties
@@ -1,12 +1,15 @@
 ###############################################################################
-# Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+# Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #  
-#   Contributors:
+# SPDX-License-Identifier: EPL-2.0
+#  
+# Contributors:
 #      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+#      Chalmers | University of Gothenburg - additional features, updated API
 ###############################################################################
 source.. = src/
 output.. = bin/
diff --git a/bundles/org.eclipse.capra.handler.cdt/plugin.xml b/bundles/org.eclipse.capra.handler.cdt/plugin.xml
index 9a5365d..b7fa8d6 100644
--- a/bundles/org.eclipse.capra.handler.cdt/plugin.xml
+++ b/bundles/org.eclipse.capra.handler.cdt/plugin.xml
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.4"?>
 <!--
-    Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+    Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
     All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
+    are made available under the terms of the Eclipse Public License v2.0
     which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
+    http://www.eclipse.org/legal/epl-v20.html
      
-      Contributors:
+    SPDX-License-Identifier: EPL-2.0
+     
+    Contributors:
          Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+         Chalmers | University of Gothenburg - additional features, updated API
  -->
 
 <plugin>
diff --git a/bundles/org.eclipse.capra.handler.cdt/pom.xml b/bundles/org.eclipse.capra.handler.cdt/pom.xml
index 01abd14..efda1f1 100644
--- a/bundles/org.eclipse.capra.handler.cdt/pom.xml
+++ b/bundles/org.eclipse.capra.handler.cdt/pom.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+    Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
     All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
+    are made available under the terms of the Eclipse Public License v2.0
     which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
+    http://www.eclipse.org/legal/epl-v20.html
      
-      Contributors:
+    SPDX-License-Identifier: EPL-2.0
+     
+    Contributors:
          Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+         Chalmers | University of Gothenburg - additional features, updated API
  -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/bundles/org.eclipse.capra.handler.cdt/src/org/eclipse/capra/handler/cdt/Activator.java b/bundles/org.eclipse.capra.handler.cdt/src/org/eclipse/capra/handler/cdt/Activator.java
index 15b398a..642a08d 100644
--- a/bundles/org.eclipse.capra.handler.cdt/src/org/eclipse/capra/handler/cdt/Activator.java
+++ b/bundles/org.eclipse.capra.handler.cdt/src/org/eclipse/capra/handler/cdt/Activator.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
+ * http://www.eclipse.org/legal/epl-v20.html
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ *  
  * Contributors:
- *    Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.handler.cdt;
 
diff --git a/bundles/org.eclipse.capra.handler.cdt/src/org/eclipse/capra/handler/cdt/CDTAnnotate.java b/bundles/org.eclipse.capra.handler.cdt/src/org/eclipse/capra/handler/cdt/CDTAnnotate.java
index 8197423..86c2153 100644
--- a/bundles/org.eclipse.capra.handler.cdt/src/org/eclipse/capra/handler/cdt/CDTAnnotate.java
+++ b/bundles/org.eclipse.capra.handler.cdt/src/org/eclipse/capra/handler/cdt/CDTAnnotate.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- *   Contributors:
+ * http://www.eclipse.org/legal/epl-v20.html
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
  *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.handler.cdt;
 
diff --git a/bundles/org.eclipse.capra.handler.cdt/src/org/eclipse/capra/handler/cdt/CDTHandler.java b/bundles/org.eclipse.capra.handler.cdt/src/org/eclipse/capra/handler/cdt/CDTHandler.java
index af71df6..5445743 100644
--- a/bundles/org.eclipse.capra.handler.cdt/src/org/eclipse/capra/handler/cdt/CDTHandler.java
+++ b/bundles/org.eclipse.capra.handler.cdt/src/org/eclipse/capra/handler/cdt/CDTHandler.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- *   Contributors:
+ * http://www.eclipse.org/legal/epl-v20.html
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
  *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.handler.cdt;
 
diff --git a/bundles/org.eclipse.capra.handler.cdt/src/org/eclipse/capra/handler/cdt/notification/CElementChangeListener.java b/bundles/org.eclipse.capra.handler.cdt/src/org/eclipse/capra/handler/cdt/notification/CElementChangeListener.java
index 12c3254..9eb7854 100644
--- a/bundles/org.eclipse.capra.handler.cdt/src/org/eclipse/capra/handler/cdt/notification/CElementChangeListener.java
+++ b/bundles/org.eclipse.capra.handler.cdt/src/org/eclipse/capra/handler/cdt/notification/CElementChangeListener.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- *   Contributors:
+ * http://www.eclipse.org/legal/epl-v20.html
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
  *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.handler.cdt.notification;
 
diff --git a/bundles/org.eclipse.capra.handler.cdt/src/org/eclipse/capra/handler/cdt/notification/StartUp.java b/bundles/org.eclipse.capra.handler.cdt/src/org/eclipse/capra/handler/cdt/notification/StartUp.java
index 24cbbb8..28a8c12 100644
--- a/bundles/org.eclipse.capra.handler.cdt/src/org/eclipse/capra/handler/cdt/notification/StartUp.java
+++ b/bundles/org.eclipse.capra.handler.cdt/src/org/eclipse/capra/handler/cdt/notification/StartUp.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *  
- *   Contributors:
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
  *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 
 package org.eclipse.capra.handler.cdt.notification;
diff --git a/bundles/org.eclipse.capra.handler.cdt/src/org/eclipse/capra/handler/cdt/preferences/CDTPreferences.java b/bundles/org.eclipse.capra.handler.cdt/src/org/eclipse/capra/handler/cdt/preferences/CDTPreferences.java
index bae771c..633fd55 100644
--- a/bundles/org.eclipse.capra.handler.cdt/src/org/eclipse/capra/handler/cdt/preferences/CDTPreferences.java
+++ b/bundles/org.eclipse.capra.handler.cdt/src/org/eclipse/capra/handler/cdt/preferences/CDTPreferences.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
+ * http://www.eclipse.org/legal/epl-v20.html
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ *  
  * Contributors:
- *    Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.handler.cdt.preferences;
 
diff --git a/bundles/org.eclipse.capra.handler.emf/build.properties b/bundles/org.eclipse.capra.handler.emf/build.properties
index 9fc85e9..af525cf 100644
--- a/bundles/org.eclipse.capra.handler.emf/build.properties
+++ b/bundles/org.eclipse.capra.handler.emf/build.properties
@@ -1,12 +1,15 @@
 ###############################################################################
-# Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+# Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #  
-#   Contributors:
+# SPDX-License-Identifier: EPL-2.0
+#  
+# Contributors:
 #      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+#      Chalmers | University of Gothenburg - additional features, updated API
 ###############################################################################
 source.. = src/
 bin.includes = META-INF/,\
diff --git a/bundles/org.eclipse.capra.handler.emf/plugin.xml b/bundles/org.eclipse.capra.handler.emf/plugin.xml
index e3560a2..ae9f395 100644
--- a/bundles/org.eclipse.capra.handler.emf/plugin.xml
+++ b/bundles/org.eclipse.capra.handler.emf/plugin.xml
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.4"?>
 <!--
-    Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+    Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
     All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
+    are made available under the terms of the Eclipse Public License v2.0
     which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
+    http://www.eclipse.org/legal/epl-v20.html
      
-      Contributors:
+    SPDX-License-Identifier: EPL-2.0
+     
+    Contributors:
          Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+         Chalmers | University of Gothenburg - additional features, updated API
  -->
 
 <plugin>
diff --git a/bundles/org.eclipse.capra.handler.emf/pom.xml b/bundles/org.eclipse.capra.handler.emf/pom.xml
index 46e8067..0984c79 100644
--- a/bundles/org.eclipse.capra.handler.emf/pom.xml
+++ b/bundles/org.eclipse.capra.handler.emf/pom.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+    Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
     All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
+    are made available under the terms of the Eclipse Public License v2.0
     which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
+    http://www.eclipse.org/legal/epl-v20.html
      
-      Contributors:
+    SPDX-License-Identifier: EPL-2.0
+     
+    Contributors:
          Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+         Chalmers | University of Gothenburg - additional features, updated API
  -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/bundles/org.eclipse.capra.handler.emf/src/org/eclipse/capra/handler/emf/EMFHandler.java b/bundles/org.eclipse.capra.handler.emf/src/org/eclipse/capra/handler/emf/EMFHandler.java
index f9581eb..0d81f26 100644
--- a/bundles/org.eclipse.capra.handler.emf/src/org/eclipse/capra/handler/emf/EMFHandler.java
+++ b/bundles/org.eclipse.capra.handler.emf/src/org/eclipse/capra/handler/emf/EMFHandler.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- *   Contributors:
+ * http://www.eclipse.org/legal/epl-v20.html
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
  *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.handler.emf;
 
diff --git a/bundles/org.eclipse.capra.handler.emf/src/org/eclipse/capra/handler/emf/notification/EditorListener.java b/bundles/org.eclipse.capra.handler.emf/src/org/eclipse/capra/handler/emf/notification/EditorListener.java
index 9663b9a..1d17baf 100644
--- a/bundles/org.eclipse.capra.handler.emf/src/org/eclipse/capra/handler/emf/notification/EditorListener.java
+++ b/bundles/org.eclipse.capra.handler.emf/src/org/eclipse/capra/handler/emf/notification/EditorListener.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *  
- *   Contributors:
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
  *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.handler.emf.notification;
 
diff --git a/bundles/org.eclipse.capra.handler.emf/src/org/eclipse/capra/handler/emf/notification/ModelChangeListener.java b/bundles/org.eclipse.capra.handler.emf/src/org/eclipse/capra/handler/emf/notification/ModelChangeListener.java
index 746696a..fbfc125 100644
--- a/bundles/org.eclipse.capra.handler.emf/src/org/eclipse/capra/handler/emf/notification/ModelChangeListener.java
+++ b/bundles/org.eclipse.capra.handler.emf/src/org/eclipse/capra/handler/emf/notification/ModelChangeListener.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *  
- *   Contributors:
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
  *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.handler.emf.notification;
 
diff --git a/bundles/org.eclipse.capra.handler.emf/src/org/eclipse/capra/handler/emf/notification/StartUp.java b/bundles/org.eclipse.capra.handler.emf/src/org/eclipse/capra/handler/emf/notification/StartUp.java
index c371297..97a15dd 100644
--- a/bundles/org.eclipse.capra.handler.emf/src/org/eclipse/capra/handler/emf/notification/StartUp.java
+++ b/bundles/org.eclipse.capra.handler.emf/src/org/eclipse/capra/handler/emf/notification/StartUp.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *  
- *   Contributors:
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
  *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.handler.emf.notification;
 
diff --git a/bundles/org.eclipse.capra.handler.featureide/build.properties b/bundles/org.eclipse.capra.handler.featureide/build.properties
index 1f1586d..af525cf 100644
--- a/bundles/org.eclipse.capra.handler.featureide/build.properties
+++ b/bundles/org.eclipse.capra.handler.featureide/build.properties
@@ -1,12 +1,15 @@
 ###############################################################################
-#  Copyright (c) 2016 Chalmers | Gothenburg University, rt-labs and others.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+# Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v2.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v20.html
 #  
-#   Contributors:
-#      Chalmers|Gothenburg University and rt-labs - initial API and implementation and/or initial documentation
+# SPDX-License-Identifier: EPL-2.0
+#  
+# Contributors:
+#      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+#      Chalmers | University of Gothenburg - additional features, updated API
 ###############################################################################
 source.. = src/
 bin.includes = META-INF/,\
diff --git a/bundles/org.eclipse.capra.handler.featureide/plugin.xml b/bundles/org.eclipse.capra.handler.featureide/plugin.xml
index 4ef122c..9c92204 100644
--- a/bundles/org.eclipse.capra.handler.featureide/plugin.xml
+++ b/bundles/org.eclipse.capra.handler.featureide/plugin.xml
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.4"?>
 <!--
-     Copyright (c) 2016 Chalmers | Gothenburg University, rt-labs and others.
-     All rights reserved. This program and the accompanying materials
-     are made available under the terms of the Eclipse Public License v1.0
-     which accompanies this distribution, and is available at
-     http://www.eclipse.org/legal/epl-v10.html
+    Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License v2.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v20.html
      
-      Contributors:
-         Chalmers|Gothenburg University and rt-labs - initial API and implementation and/or initial documentation
+    SPDX-License-Identifier: EPL-2.0
+     
+    Contributors:
+         Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+         Chalmers | University of Gothenburg - additional features, updated API
  -->
 
 <plugin>
diff --git a/bundles/org.eclipse.capra.handler.featureide/pom.xml b/bundles/org.eclipse.capra.handler.featureide/pom.xml
index 12f825e..0c12f88 100644
--- a/bundles/org.eclipse.capra.handler.featureide/pom.xml
+++ b/bundles/org.eclipse.capra.handler.featureide/pom.xml
@@ -1,4 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License v2.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v20.html
+     
+    SPDX-License-Identifier: EPL-2.0
+     
+    Contributors:
+         Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+         Chalmers | University of Gothenburg - additional features, updated API
+ -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/bundles/org.eclipse.capra.handler.featureide/src/org/eclipse/capra/handler/featureide/FeatureIdeHandler.java b/bundles/org.eclipse.capra.handler.featureide/src/org/eclipse/capra/handler/featureide/FeatureIdeHandler.java
index f512b04..885f9bd 100644
--- a/bundles/org.eclipse.capra.handler.featureide/src/org/eclipse/capra/handler/featureide/FeatureIdeHandler.java
+++ b/bundles/org.eclipse.capra.handler.featureide/src/org/eclipse/capra/handler/featureide/FeatureIdeHandler.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- *  Copyright (c) 2016 Chalmers | Gothenburg University, rt-labs and others.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v20.html
  *  
- *   Contributors:
- *      Chalmers|Gothenburg University and rt-labs - initial API and implementation and/or initial documentation
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
+ *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.handler.featureide;
 
diff --git a/bundles/org.eclipse.capra.handler.file/build.properties b/bundles/org.eclipse.capra.handler.file/build.properties
index 9fc85e9..af525cf 100644
--- a/bundles/org.eclipse.capra.handler.file/build.properties
+++ b/bundles/org.eclipse.capra.handler.file/build.properties
@@ -1,12 +1,15 @@
 ###############################################################################
-# Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+# Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #  
-#   Contributors:
+# SPDX-License-Identifier: EPL-2.0
+#  
+# Contributors:
 #      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+#      Chalmers | University of Gothenburg - additional features, updated API
 ###############################################################################
 source.. = src/
 bin.includes = META-INF/,\
diff --git a/bundles/org.eclipse.capra.handler.file/plugin.xml b/bundles/org.eclipse.capra.handler.file/plugin.xml
index 1392d9c..6b7c7f8 100644
--- a/bundles/org.eclipse.capra.handler.file/plugin.xml
+++ b/bundles/org.eclipse.capra.handler.file/plugin.xml
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.4"?>
 <!--
-    Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+    Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
     All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
+    are made available under the terms of the Eclipse Public License v2.0
     which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
+    http://www.eclipse.org/legal/epl-v20.html
      
-      Contributors:
+    SPDX-License-Identifier: EPL-2.0
+     
+    Contributors:
          Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+         Chalmers | University of Gothenburg - additional features, updated API
  -->
 
 <plugin>
diff --git a/bundles/org.eclipse.capra.handler.file/pom.xml b/bundles/org.eclipse.capra.handler.file/pom.xml
index fa85f86..2e0f4f9 100644
--- a/bundles/org.eclipse.capra.handler.file/pom.xml
+++ b/bundles/org.eclipse.capra.handler.file/pom.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+    Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
     All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
+    are made available under the terms of the Eclipse Public License v2.0
     which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
+    http://www.eclipse.org/legal/epl-v20.html
      
-      Contributors:
+    SPDX-License-Identifier: EPL-2.0
+     
+    Contributors:
          Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+         Chalmers | University of Gothenburg - additional features, updated API
  -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/bundles/org.eclipse.capra.handler.file/src/org/eclipse/capra/handler/file/FileHandler.java b/bundles/org.eclipse.capra.handler.file/src/org/eclipse/capra/handler/file/FileHandler.java
index 0d79218..c405702 100644
--- a/bundles/org.eclipse.capra.handler.file/src/org/eclipse/capra/handler/file/FileHandler.java
+++ b/bundles/org.eclipse.capra.handler.file/src/org/eclipse/capra/handler/file/FileHandler.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *  
- *   Contributors:
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
  *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.handler.file;
 
diff --git a/bundles/org.eclipse.capra.handler.file/src/org/eclipse/capra/handler/file/notification/FileChangeListener.java b/bundles/org.eclipse.capra.handler.file/src/org/eclipse/capra/handler/file/notification/FileChangeListener.java
index 980df57..c9ed7fc 100644
--- a/bundles/org.eclipse.capra.handler.file/src/org/eclipse/capra/handler/file/notification/FileChangeListener.java
+++ b/bundles/org.eclipse.capra.handler.file/src/org/eclipse/capra/handler/file/notification/FileChangeListener.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- *   Contributors:
+ * http://www.eclipse.org/legal/epl-v20.html
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
  *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.handler.file.notification;
 
diff --git a/bundles/org.eclipse.capra.handler.file/src/org/eclipse/capra/handler/file/notification/StartUp.java b/bundles/org.eclipse.capra.handler.file/src/org/eclipse/capra/handler/file/notification/StartUp.java
index a17961a..2c6ac5c 100644
--- a/bundles/org.eclipse.capra.handler.file/src/org/eclipse/capra/handler/file/notification/StartUp.java
+++ b/bundles/org.eclipse.capra.handler.file/src/org/eclipse/capra/handler/file/notification/StartUp.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *  
- *   Contributors:
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
  *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.handler.file.notification;
 
diff --git a/bundles/org.eclipse.capra.handler.gef/build.properties b/bundles/org.eclipse.capra.handler.gef/build.properties
index 9fc85e9..af525cf 100644
--- a/bundles/org.eclipse.capra.handler.gef/build.properties
+++ b/bundles/org.eclipse.capra.handler.gef/build.properties
@@ -1,12 +1,15 @@
 ###############################################################################
-# Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+# Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #  
-#   Contributors:
+# SPDX-License-Identifier: EPL-2.0
+#  
+# Contributors:
 #      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+#      Chalmers | University of Gothenburg - additional features, updated API
 ###############################################################################
 source.. = src/
 bin.includes = META-INF/,\
diff --git a/bundles/org.eclipse.capra.handler.gef/plugin.xml b/bundles/org.eclipse.capra.handler.gef/plugin.xml
index 475ad27..b21f3fe 100644
--- a/bundles/org.eclipse.capra.handler.gef/plugin.xml
+++ b/bundles/org.eclipse.capra.handler.gef/plugin.xml
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.4"?>
 <!--
-    Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+    Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
     All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
+    are made available under the terms of the Eclipse Public License v2.0
     which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
+    http://www.eclipse.org/legal/epl-v20.html
      
-      Contributors:
+    SPDX-License-Identifier: EPL-2.0
+     
+    Contributors:
          Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+         Chalmers | University of Gothenburg - additional features, updated API
  -->
 
 <plugin>
diff --git a/bundles/org.eclipse.capra.handler.gef/pom.xml b/bundles/org.eclipse.capra.handler.gef/pom.xml
index 22f233b..b6c0189 100644
--- a/bundles/org.eclipse.capra.handler.gef/pom.xml
+++ b/bundles/org.eclipse.capra.handler.gef/pom.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+    Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
     All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
+    are made available under the terms of the Eclipse Public License v2.0
     which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
+    http://www.eclipse.org/legal/epl-v20.html
      
-      Contributors:
+    SPDX-License-Identifier: EPL-2.0
+     
+    Contributors:
          Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+         Chalmers | University of Gothenburg - additional features, updated API
  -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/bundles/org.eclipse.capra.handler.gef/src/org/eclipse/capra/handler/gef/GEFHandler.java b/bundles/org.eclipse.capra.handler.gef/src/org/eclipse/capra/handler/gef/GEFHandler.java
index 3a1c2f4..f10ac11 100644
--- a/bundles/org.eclipse.capra.handler.gef/src/org/eclipse/capra/handler/gef/GEFHandler.java
+++ b/bundles/org.eclipse.capra.handler.gef/src/org/eclipse/capra/handler/gef/GEFHandler.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *  
- *   Contributors:
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
  *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.handler.gef;
 
diff --git a/bundles/org.eclipse.capra.handler.hudson/build.properties b/bundles/org.eclipse.capra.handler.hudson/build.properties
index 9fc85e9..af525cf 100644
--- a/bundles/org.eclipse.capra.handler.hudson/build.properties
+++ b/bundles/org.eclipse.capra.handler.hudson/build.properties
@@ -1,12 +1,15 @@
 ###############################################################################
-# Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+# Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #  
-#   Contributors:
+# SPDX-License-Identifier: EPL-2.0
+#  
+# Contributors:
 #      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+#      Chalmers | University of Gothenburg - additional features, updated API
 ###############################################################################
 source.. = src/
 bin.includes = META-INF/,\
diff --git a/bundles/org.eclipse.capra.handler.hudson/plugin.xml b/bundles/org.eclipse.capra.handler.hudson/plugin.xml
index 287f89b..2a4ed02 100644
--- a/bundles/org.eclipse.capra.handler.hudson/plugin.xml
+++ b/bundles/org.eclipse.capra.handler.hudson/plugin.xml
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.4"?>
 <!--
-    Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+    Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
     All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
+    are made available under the terms of the Eclipse Public License v2.0
     which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
+    http://www.eclipse.org/legal/epl-v20.html
      
-      Contributors:
+    SPDX-License-Identifier: EPL-2.0
+     
+    Contributors:
          Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+         Chalmers | University of Gothenburg - additional features, updated API
  -->
 
 <plugin>
diff --git a/bundles/org.eclipse.capra.handler.hudson/pom.xml b/bundles/org.eclipse.capra.handler.hudson/pom.xml
index 5ab476c..2865bfa 100644
--- a/bundles/org.eclipse.capra.handler.hudson/pom.xml
+++ b/bundles/org.eclipse.capra.handler.hudson/pom.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+    Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
     All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
+    are made available under the terms of the Eclipse Public License v2.0
     which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
+    http://www.eclipse.org/legal/epl-v20.html
      
-      Contributors:
+    SPDX-License-Identifier: EPL-2.0
+     
+    Contributors:
          Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+         Chalmers | University of Gothenburg - additional features, updated API
  -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/bundles/org.eclipse.capra.handler.hudson/src/org/eclipse/capra/handler/hudson/BuildElementHandler.java b/bundles/org.eclipse.capra.handler.hudson/src/org/eclipse/capra/handler/hudson/BuildElementHandler.java
index b2e310d..d40aad3 100644
--- a/bundles/org.eclipse.capra.handler.hudson/src/org/eclipse/capra/handler/hudson/BuildElementHandler.java
+++ b/bundles/org.eclipse.capra.handler.hudson/src/org/eclipse/capra/handler/hudson/BuildElementHandler.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- *   Contributors:
+ * http://www.eclipse.org/legal/epl-v20.html
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
  *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.handler.hudson;
 
diff --git a/bundles/org.eclipse.capra.handler.hudson/src/org/eclipse/capra/handler/hudson/TestElementHandler.java b/bundles/org.eclipse.capra.handler.hudson/src/org/eclipse/capra/handler/hudson/TestElementHandler.java
index e8e1767..ef530d7 100644
--- a/bundles/org.eclipse.capra.handler.hudson/src/org/eclipse/capra/handler/hudson/TestElementHandler.java
+++ b/bundles/org.eclipse.capra.handler.hudson/src/org/eclipse/capra/handler/hudson/TestElementHandler.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- *   Contributors:
+ * http://www.eclipse.org/legal/epl-v20.html
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
  *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.handler.hudson;
 
diff --git a/bundles/org.eclipse.capra.handler.jdt/build.properties b/bundles/org.eclipse.capra.handler.jdt/build.properties
index 9fc85e9..af525cf 100644
--- a/bundles/org.eclipse.capra.handler.jdt/build.properties
+++ b/bundles/org.eclipse.capra.handler.jdt/build.properties
@@ -1,12 +1,15 @@
 ###############################################################################
-# Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+# Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #  
-#   Contributors:
+# SPDX-License-Identifier: EPL-2.0
+#  
+# Contributors:
 #      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+#      Chalmers | University of Gothenburg - additional features, updated API
 ###############################################################################
 source.. = src/
 bin.includes = META-INF/,\
diff --git a/bundles/org.eclipse.capra.handler.jdt/plugin.xml b/bundles/org.eclipse.capra.handler.jdt/plugin.xml
index 830cb3b..e4092be 100644
--- a/bundles/org.eclipse.capra.handler.jdt/plugin.xml
+++ b/bundles/org.eclipse.capra.handler.jdt/plugin.xml
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.4"?>
 <!--
-    Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+    Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
     All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
+    are made available under the terms of the Eclipse Public License v2.0
     which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
+    http://www.eclipse.org/legal/epl-v20.html
      
-      Contributors:
+    SPDX-License-Identifier: EPL-2.0
+     
+    Contributors:
          Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+         Chalmers | University of Gothenburg - additional features, updated API
  -->
 
 <plugin>
diff --git a/bundles/org.eclipse.capra.handler.jdt/pom.xml b/bundles/org.eclipse.capra.handler.jdt/pom.xml
index df69090..d21cf37 100644
--- a/bundles/org.eclipse.capra.handler.jdt/pom.xml
+++ b/bundles/org.eclipse.capra.handler.jdt/pom.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+    Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
     All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
+    are made available under the terms of the Eclipse Public License v2.0
     which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
+    http://www.eclipse.org/legal/epl-v20.html
      
-      Contributors:
+    SPDX-License-Identifier: EPL-2.0
+     
+    Contributors:
          Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+         Chalmers | University of Gothenburg - additional features, updated API
  -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/bundles/org.eclipse.capra.handler.jdt/src/org/eclipse/capra/handler/jdt/Activator.java b/bundles/org.eclipse.capra.handler.jdt/src/org/eclipse/capra/handler/jdt/Activator.java
index 09a7d8e..ccd5628 100644
--- a/bundles/org.eclipse.capra.handler.jdt/src/org/eclipse/capra/handler/jdt/Activator.java
+++ b/bundles/org.eclipse.capra.handler.jdt/src/org/eclipse/capra/handler/jdt/Activator.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
+ * http://www.eclipse.org/legal/epl-v20.html
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ *  
  * Contributors:
- *    Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.handler.jdt;
 
diff --git a/bundles/org.eclipse.capra.handler.jdt/src/org/eclipse/capra/handler/jdt/JDTAnnotate.java b/bundles/org.eclipse.capra.handler.jdt/src/org/eclipse/capra/handler/jdt/JDTAnnotate.java
index 4f617af..0cd1733 100644
--- a/bundles/org.eclipse.capra.handler.jdt/src/org/eclipse/capra/handler/jdt/JDTAnnotate.java
+++ b/bundles/org.eclipse.capra.handler.jdt/src/org/eclipse/capra/handler/jdt/JDTAnnotate.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- *   Contributors:
+ * http://www.eclipse.org/legal/epl-v20.html
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
  *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.handler.jdt;
 
diff --git a/bundles/org.eclipse.capra.handler.jdt/src/org/eclipse/capra/handler/jdt/JavaElementHandler.java b/bundles/org.eclipse.capra.handler.jdt/src/org/eclipse/capra/handler/jdt/JavaElementHandler.java
index 24de8d3..2a51751 100644
--- a/bundles/org.eclipse.capra.handler.jdt/src/org/eclipse/capra/handler/jdt/JavaElementHandler.java
+++ b/bundles/org.eclipse.capra.handler.jdt/src/org/eclipse/capra/handler/jdt/JavaElementHandler.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- *   Contributors:
+ * http://www.eclipse.org/legal/epl-v20.html
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
  *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.handler.jdt;
 
diff --git a/bundles/org.eclipse.capra.handler.jdt/src/org/eclipse/capra/handler/jdt/notification/JavaElementChangeListener.java b/bundles/org.eclipse.capra.handler.jdt/src/org/eclipse/capra/handler/jdt/notification/JavaElementChangeListener.java
index 20469df..fb0caf3 100644
--- a/bundles/org.eclipse.capra.handler.jdt/src/org/eclipse/capra/handler/jdt/notification/JavaElementChangeListener.java
+++ b/bundles/org.eclipse.capra.handler.jdt/src/org/eclipse/capra/handler/jdt/notification/JavaElementChangeListener.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- *   Contributors:
+ * http://www.eclipse.org/legal/epl-v20.html
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
  *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.handler.jdt.notification;
 
diff --git a/bundles/org.eclipse.capra.handler.jdt/src/org/eclipse/capra/handler/jdt/notification/StartUp.java b/bundles/org.eclipse.capra.handler.jdt/src/org/eclipse/capra/handler/jdt/notification/StartUp.java
index e171846..64a20d8 100644
--- a/bundles/org.eclipse.capra.handler.jdt/src/org/eclipse/capra/handler/jdt/notification/StartUp.java
+++ b/bundles/org.eclipse.capra.handler.jdt/src/org/eclipse/capra/handler/jdt/notification/StartUp.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *  
- *   Contributors:
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
  *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.handler.jdt.notification;
 
diff --git a/bundles/org.eclipse.capra.handler.jdt/src/org/eclipse/capra/handler/jdt/preferences/JDTPreferences.java b/bundles/org.eclipse.capra.handler.jdt/src/org/eclipse/capra/handler/jdt/preferences/JDTPreferences.java
index 175a513..8961aa6 100644
--- a/bundles/org.eclipse.capra.handler.jdt/src/org/eclipse/capra/handler/jdt/preferences/JDTPreferences.java
+++ b/bundles/org.eclipse.capra.handler.jdt/src/org/eclipse/capra/handler/jdt/preferences/JDTPreferences.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
+ * http://www.eclipse.org/legal/epl-v20.html
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ *  
  * Contributors:
- *    Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.handler.jdt.preferences;
 
diff --git a/bundles/org.eclipse.capra.handler.marker/build.properties b/bundles/org.eclipse.capra.handler.marker/build.properties
index 9fc85e9..af525cf 100644
--- a/bundles/org.eclipse.capra.handler.marker/build.properties
+++ b/bundles/org.eclipse.capra.handler.marker/build.properties
@@ -1,12 +1,15 @@
 ###############################################################################
-# Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+# Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #  
-#   Contributors:
+# SPDX-License-Identifier: EPL-2.0
+#  
+# Contributors:
 #      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+#      Chalmers | University of Gothenburg - additional features, updated API
 ###############################################################################
 source.. = src/
 bin.includes = META-INF/,\
diff --git a/bundles/org.eclipse.capra.handler.marker/plugin.xml b/bundles/org.eclipse.capra.handler.marker/plugin.xml
index 0ca44c2..3aec155 100644
--- a/bundles/org.eclipse.capra.handler.marker/plugin.xml
+++ b/bundles/org.eclipse.capra.handler.marker/plugin.xml
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.4"?>
 <!--
-    Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+    Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
     All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
+    are made available under the terms of the Eclipse Public License v2.0
     which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
+    http://www.eclipse.org/legal/epl-v20.html
      
-      Contributors:
+    SPDX-License-Identifier: EPL-2.0
+     
+    Contributors:
          Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+         Chalmers | University of Gothenburg - additional features, updated API
  -->
 
 <plugin>
diff --git a/bundles/org.eclipse.capra.handler.marker/pom.xml b/bundles/org.eclipse.capra.handler.marker/pom.xml
index 6063c60..9fcc28f 100644
--- a/bundles/org.eclipse.capra.handler.marker/pom.xml
+++ b/bundles/org.eclipse.capra.handler.marker/pom.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+    Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
     All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
+    are made available under the terms of the Eclipse Public License v2.0
     which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
+    http://www.eclipse.org/legal/epl-v20.html
      
-      Contributors:
+    SPDX-License-Identifier: EPL-2.0
+     
+    Contributors:
          Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+         Chalmers | University of Gothenburg - additional features, updated API
  -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/bundles/org.eclipse.capra.handler.marker/src/org/eclipse/capra/handler/marker/MarkerHandler.java b/bundles/org.eclipse.capra.handler.marker/src/org/eclipse/capra/handler/marker/MarkerHandler.java
index 964c8a3..ac87925 100644
--- a/bundles/org.eclipse.capra.handler.marker/src/org/eclipse/capra/handler/marker/MarkerHandler.java
+++ b/bundles/org.eclipse.capra.handler.marker/src/org/eclipse/capra/handler/marker/MarkerHandler.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2017 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *  
- *   Contributors:
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
  *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.handler.marker;
 
diff --git a/bundles/org.eclipse.capra.handler.mylyn/build.properties b/bundles/org.eclipse.capra.handler.mylyn/build.properties
index 9fc85e9..af525cf 100644
--- a/bundles/org.eclipse.capra.handler.mylyn/build.properties
+++ b/bundles/org.eclipse.capra.handler.mylyn/build.properties
@@ -1,12 +1,15 @@
 ###############################################################################
-# Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+# Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #  
-#   Contributors:
+# SPDX-License-Identifier: EPL-2.0
+#  
+# Contributors:
 #      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+#      Chalmers | University of Gothenburg - additional features, updated API
 ###############################################################################
 source.. = src/
 bin.includes = META-INF/,\
diff --git a/bundles/org.eclipse.capra.handler.mylyn/plugin.xml b/bundles/org.eclipse.capra.handler.mylyn/plugin.xml
index 4ab6a31..3ff00eb 100644
--- a/bundles/org.eclipse.capra.handler.mylyn/plugin.xml
+++ b/bundles/org.eclipse.capra.handler.mylyn/plugin.xml
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.4"?>
 <!--
-    Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+    Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
     All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
+    are made available under the terms of the Eclipse Public License v2.0
     which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
+    http://www.eclipse.org/legal/epl-v20.html
      
-      Contributors:
+    SPDX-License-Identifier: EPL-2.0
+     
+    Contributors:
          Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+         Chalmers | University of Gothenburg - additional features, updated API
  -->
 
 <plugin>
diff --git a/bundles/org.eclipse.capra.handler.mylyn/pom.xml b/bundles/org.eclipse.capra.handler.mylyn/pom.xml
index 0ac6551..fa4ae0e 100644
--- a/bundles/org.eclipse.capra.handler.mylyn/pom.xml
+++ b/bundles/org.eclipse.capra.handler.mylyn/pom.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+    Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
     All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
+    are made available under the terms of the Eclipse Public License v2.0
     which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
+    http://www.eclipse.org/legal/epl-v20.html
      
-      Contributors:
+    SPDX-License-Identifier: EPL-2.0
+     
+    Contributors:
          Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+         Chalmers | University of Gothenburg - additional features, updated API
  -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/bundles/org.eclipse.capra.handler.mylyn/src/org/eclipse/capra/handler/mylyn/MylynHandler.java b/bundles/org.eclipse.capra.handler.mylyn/src/org/eclipse/capra/handler/mylyn/MylynHandler.java
index 8fa85e3..050a367 100644
--- a/bundles/org.eclipse.capra.handler.mylyn/src/org/eclipse/capra/handler/mylyn/MylynHandler.java
+++ b/bundles/org.eclipse.capra.handler.mylyn/src/org/eclipse/capra/handler/mylyn/MylynHandler.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *  
- *   Contributors:
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
  *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.handler.mylyn;
 
diff --git a/bundles/org.eclipse.capra.handler.office/build.properties b/bundles/org.eclipse.capra.handler.office/build.properties
index 9fc85e9..af525cf 100644
--- a/bundles/org.eclipse.capra.handler.office/build.properties
+++ b/bundles/org.eclipse.capra.handler.office/build.properties
@@ -1,12 +1,15 @@
 ###############################################################################
-# Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+# Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #  
-#   Contributors:
+# SPDX-License-Identifier: EPL-2.0
+#  
+# Contributors:
 #      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+#      Chalmers | University of Gothenburg - additional features, updated API
 ###############################################################################
 source.. = src/
 bin.includes = META-INF/,\
diff --git a/bundles/org.eclipse.capra.handler.office/plugin.xml b/bundles/org.eclipse.capra.handler.office/plugin.xml
index ad4118c..f1520d2 100644
--- a/bundles/org.eclipse.capra.handler.office/plugin.xml
+++ b/bundles/org.eclipse.capra.handler.office/plugin.xml
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.4"?>
 <!--
-    Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+    Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
     All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
+    are made available under the terms of the Eclipse Public License v2.0
     which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
+    http://www.eclipse.org/legal/epl-v20.html
      
-      Contributors:
+    SPDX-License-Identifier: EPL-2.0
+     
+    Contributors:
          Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+         Chalmers | University of Gothenburg - additional features, updated API
  -->
 
 <plugin>
diff --git a/bundles/org.eclipse.capra.handler.office/pom.xml b/bundles/org.eclipse.capra.handler.office/pom.xml
index 3cf9aab..52b580c 100644
--- a/bundles/org.eclipse.capra.handler.office/pom.xml
+++ b/bundles/org.eclipse.capra.handler.office/pom.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+    Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
     All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
+    are made available under the terms of the Eclipse Public License v2.0
     which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
+    http://www.eclipse.org/legal/epl-v20.html
      
-      Contributors:
+    SPDX-License-Identifier: EPL-2.0
+     
+    Contributors:
          Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+         Chalmers | University of Gothenburg - additional features, updated API
  -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
diff --git a/bundles/org.eclipse.capra.handler.office/src/org/eclipse/capra/handler/office/OfficeHandler.java b/bundles/org.eclipse.capra.handler.office/src/org/eclipse/capra/handler/office/OfficeHandler.java
index 2921717..6a7019e 100644
--- a/bundles/org.eclipse.capra.handler.office/src/org/eclipse/capra/handler/office/OfficeHandler.java
+++ b/bundles/org.eclipse.capra.handler.office/src/org/eclipse/capra/handler/office/OfficeHandler.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
+ * http://www.eclipse.org/legal/epl-v20.html
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ *  
  * Contributors:
- * 	   Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 
 package org.eclipse.capra.handler.office;
diff --git a/bundles/org.eclipse.capra.handler.papyrus/build.properties b/bundles/org.eclipse.capra.handler.papyrus/build.properties
index a638415..a40b961 100644
--- a/bundles/org.eclipse.capra.handler.papyrus/build.properties
+++ b/bundles/org.eclipse.capra.handler.papyrus/build.properties
@@ -1,12 +1,15 @@
 ###############################################################################

-# Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.

+# Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.

 # All rights reserved. This program and the accompanying materials

-# are made available under the terms of the Eclipse Public License v1.0

+# are made available under the terms of the Eclipse Public License v2.0

 # which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

+# http://www.eclipse.org/legal/epl-v20.html

 #  

-#   Contributors:

+# SPDX-License-Identifier: EPL-2.0

+#  

+# Contributors:

 #      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation

+#      Chalmers | University of Gothenburg - additional features, updated API

 ###############################################################################

 source.. = src/

 bin.includes = META-INF/,\

diff --git a/bundles/org.eclipse.capra.handler.papyrus/plugin.xml b/bundles/org.eclipse.capra.handler.papyrus/plugin.xml
index a4e693f..11f3c94 100644
--- a/bundles/org.eclipse.capra.handler.papyrus/plugin.xml
+++ b/bundles/org.eclipse.capra.handler.papyrus/plugin.xml
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <?eclipse version="3.4"?>

 <!--

-    Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.

+    Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.

     All rights reserved. This program and the accompanying materials

-    are made available under the terms of the Eclipse Public License v1.0

+    are made available under the terms of the Eclipse Public License v2.0

     which accompanies this distribution, and is available at

-    http://www.eclipse.org/legal/epl-v10.html

+    http://www.eclipse.org/legal/epl-v20.html

      

-      Contributors:

+    SPDX-License-Identifier: EPL-2.0

+     

+    Contributors:

          Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation

+         Chalmers | University of Gothenburg - additional features, updated API

  -->

 
 <plugin>

diff --git a/bundles/org.eclipse.capra.handler.papyrus/pom.xml b/bundles/org.eclipse.capra.handler.papyrus/pom.xml
index 1622879..c34ecf6 100644
--- a/bundles/org.eclipse.capra.handler.papyrus/pom.xml
+++ b/bundles/org.eclipse.capra.handler.papyrus/pom.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+    Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
     All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
+    are made available under the terms of the Eclipse Public License v2.0
     which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
+    http://www.eclipse.org/legal/epl-v20.html
      
-      Contributors:
+    SPDX-License-Identifier: EPL-2.0
+     
+    Contributors:
          Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+         Chalmers | University of Gothenburg - additional features, updated API
  -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/bundles/org.eclipse.capra.handler.papyrus/src/org/eclipse/capra/handler/papyrus/PapyrusHandler.java b/bundles/org.eclipse.capra.handler.papyrus/src/org/eclipse/capra/handler/papyrus/PapyrusHandler.java
index 0e11538..17d9c66 100644
--- a/bundles/org.eclipse.capra.handler.papyrus/src/org/eclipse/capra/handler/papyrus/PapyrusHandler.java
+++ b/bundles/org.eclipse.capra.handler.papyrus/src/org/eclipse/capra/handler/papyrus/PapyrusHandler.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *  
- *   Contributors:
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
  *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.handler.papyrus;
 
diff --git a/bundles/org.eclipse.capra.handler.php/build.properties b/bundles/org.eclipse.capra.handler.php/build.properties
index cc91072..af525cf 100644
--- a/bundles/org.eclipse.capra.handler.php/build.properties
+++ b/bundles/org.eclipse.capra.handler.php/build.properties
@@ -1,3 +1,16 @@
+###############################################################################
+# Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v2.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v20.html
+#  
+# SPDX-License-Identifier: EPL-2.0
+#  
+# Contributors:
+#      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+#      Chalmers | University of Gothenburg - additional features, updated API
+###############################################################################
 source.. = src/
 bin.includes = META-INF/,\
                .,\
diff --git a/bundles/org.eclipse.capra.handler.php/plugin.xml b/bundles/org.eclipse.capra.handler.php/plugin.xml
index 417bb27..f71dc3e 100644
--- a/bundles/org.eclipse.capra.handler.php/plugin.xml
+++ b/bundles/org.eclipse.capra.handler.php/plugin.xml
@@ -1,5 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.4"?>
+<!--
+    Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License v2.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v20.html
+     
+    SPDX-License-Identifier: EPL-2.0
+     
+    Contributors:
+         Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+         Chalmers | University of Gothenburg - additional features, updated API
+ -->
+
 <plugin>
    <extension
          id="id1"
diff --git a/bundles/org.eclipse.capra.handler.php/pom.xml b/bundles/org.eclipse.capra.handler.php/pom.xml
index b30d494..b2f9f6d 100644
--- a/bundles/org.eclipse.capra.handler.php/pom.xml
+++ b/bundles/org.eclipse.capra.handler.php/pom.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+    Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
     All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
+    are made available under the terms of the Eclipse Public License v2.0
     which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
+    http://www.eclipse.org/legal/epl-v20.html
      
-      Contributors:
+    SPDX-License-Identifier: EPL-2.0
+     
+    Contributors:
          Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+         Chalmers | University of Gothenburg - additional features, updated API
  -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/bundles/org.eclipse.capra.handler.php/src/org/eclipse/capra/handler/php/PhpHandler.java b/bundles/org.eclipse.capra.handler.php/src/org/eclipse/capra/handler/php/PhpHandler.java
index b3020fc..29f0a11 100644
--- a/bundles/org.eclipse.capra.handler.php/src/org/eclipse/capra/handler/php/PhpHandler.java
+++ b/bundles/org.eclipse.capra.handler.php/src/org/eclipse/capra/handler/php/PhpHandler.java
@@ -1,3 +1,16 @@
+/*******************************************************************************
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v20.html
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
+ *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
+ *******************************************************************************/
 package org.eclipse.capra.handler.php;
 
 import java.util.Collections;
diff --git a/bundles/org.eclipse.capra.handler.php/src/org/eclipse/capra/handler/php/notification/PHPElementChangeListener.java b/bundles/org.eclipse.capra.handler.php/src/org/eclipse/capra/handler/php/notification/PHPElementChangeListener.java
index 355f900..0f86ae7 100644
--- a/bundles/org.eclipse.capra.handler.php/src/org/eclipse/capra/handler/php/notification/PHPElementChangeListener.java
+++ b/bundles/org.eclipse.capra.handler.php/src/org/eclipse/capra/handler/php/notification/PHPElementChangeListener.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- *   Contributors:
+ * http://www.eclipse.org/legal/epl-v20.html
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
  *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.handler.php.notification;
 
diff --git a/bundles/org.eclipse.capra.handler.php/src/org/eclipse/capra/handler/php/notification/StartUp.java b/bundles/org.eclipse.capra.handler.php/src/org/eclipse/capra/handler/php/notification/StartUp.java
index 564990a..9a74d93 100644
--- a/bundles/org.eclipse.capra.handler.php/src/org/eclipse/capra/handler/php/notification/StartUp.java
+++ b/bundles/org.eclipse.capra.handler.php/src/org/eclipse/capra/handler/php/notification/StartUp.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- *   Contributors:
+ * http://www.eclipse.org/legal/epl-v20.html
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
  *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.handler.php.notification;
 
diff --git a/bundles/org.eclipse.capra.handler.reqIf/build.properties b/bundles/org.eclipse.capra.handler.reqIf/build.properties
index 1f1586d..af525cf 100644
--- a/bundles/org.eclipse.capra.handler.reqIf/build.properties
+++ b/bundles/org.eclipse.capra.handler.reqIf/build.properties
@@ -1,12 +1,15 @@
 ###############################################################################
-#  Copyright (c) 2016 Chalmers | Gothenburg University, rt-labs and others.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+# Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v2.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v20.html
 #  
-#   Contributors:
-#      Chalmers|Gothenburg University and rt-labs - initial API and implementation and/or initial documentation
+# SPDX-License-Identifier: EPL-2.0
+#  
+# Contributors:
+#      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+#      Chalmers | University of Gothenburg - additional features, updated API
 ###############################################################################
 source.. = src/
 bin.includes = META-INF/,\
diff --git a/bundles/org.eclipse.capra.handler.reqIf/plugin.xml b/bundles/org.eclipse.capra.handler.reqIf/plugin.xml
index 0492ca8..a6a8b2c 100644
--- a/bundles/org.eclipse.capra.handler.reqIf/plugin.xml
+++ b/bundles/org.eclipse.capra.handler.reqIf/plugin.xml
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.4"?>
 <!--
-     Copyright (c) 2016 Chalmers | Gothenburg University, rt-labs and others.
-     All rights reserved. This program and the accompanying materials
-     are made available under the terms of the Eclipse Public License v1.0
-     which accompanies this distribution, and is available at
-     http://www.eclipse.org/legal/epl-v10.html
+    Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License v2.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v20.html
      
-      Contributors:
-         Chalmers|Gothenburg University and rt-labs - initial API and implementation and/or initial documentation
+    SPDX-License-Identifier: EPL-2.0
+     
+    Contributors:
+         Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+         Chalmers | University of Gothenburg - additional features, updated API
  -->
 
 <plugin>
diff --git a/bundles/org.eclipse.capra.handler.reqIf/pom.xml b/bundles/org.eclipse.capra.handler.reqIf/pom.xml
index 89222c5..788b0cd 100644
--- a/bundles/org.eclipse.capra.handler.reqIf/pom.xml
+++ b/bundles/org.eclipse.capra.handler.reqIf/pom.xml
@@ -1,4 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License v2.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v20.html
+     
+    SPDX-License-Identifier: EPL-2.0
+     
+    Contributors:
+         Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+         Chalmers | University of Gothenburg - additional features, updated API
+ -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/bundles/org.eclipse.capra.handler.reqIf/src/org/eclipse/capra/handler/reqif/ReqIfHandler.java b/bundles/org.eclipse.capra.handler.reqIf/src/org/eclipse/capra/handler/reqif/ReqIfHandler.java
index fc41431..453a540 100644
--- a/bundles/org.eclipse.capra.handler.reqIf/src/org/eclipse/capra/handler/reqif/ReqIfHandler.java
+++ b/bundles/org.eclipse.capra.handler.reqIf/src/org/eclipse/capra/handler/reqif/ReqIfHandler.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- *  Copyright (c) 2016 Chalmers | Gothenburg University, rt-labs and others.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v20.html
  *  
- *   Contributors:
- *      Chalmers|Gothenburg University and rt-labs - initial API and implementation and/or initial documentation
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
+ *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.handler.reqif;
 
diff --git a/bundles/org.eclipse.capra.handler.uml/build.properties b/bundles/org.eclipse.capra.handler.uml/build.properties
index cc91072..af525cf 100644
--- a/bundles/org.eclipse.capra.handler.uml/build.properties
+++ b/bundles/org.eclipse.capra.handler.uml/build.properties
@@ -1,3 +1,16 @@
+###############################################################################
+# Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v2.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v20.html
+#  
+# SPDX-License-Identifier: EPL-2.0
+#  
+# Contributors:
+#      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+#      Chalmers | University of Gothenburg - additional features, updated API
+###############################################################################
 source.. = src/
 bin.includes = META-INF/,\
                .,\
diff --git a/bundles/org.eclipse.capra.handler.uml/plugin.xml b/bundles/org.eclipse.capra.handler.uml/plugin.xml
index 6d5c96c..a34ab78 100644
--- a/bundles/org.eclipse.capra.handler.uml/plugin.xml
+++ b/bundles/org.eclipse.capra.handler.uml/plugin.xml
@@ -1,5 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.4"?>
+<!--
+    Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License v2.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v20.html
+     
+    SPDX-License-Identifier: EPL-2.0
+     
+    Contributors:
+         Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+         Chalmers | University of Gothenburg - additional features, updated API
+ -->
+
 <plugin>
    <extension
          id="id1"
diff --git a/bundles/org.eclipse.capra.handler.uml/pom.xml b/bundles/org.eclipse.capra.handler.uml/pom.xml
index e7b0960..2b67872 100644
--- a/bundles/org.eclipse.capra.handler.uml/pom.xml
+++ b/bundles/org.eclipse.capra.handler.uml/pom.xml
@@ -1,4 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License v2.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v20.html
+     
+    SPDX-License-Identifier: EPL-2.0
+     
+    Contributors:
+         Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+         Chalmers | University of Gothenburg - additional features, updated API
+ -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/bundles/org.eclipse.capra.handler.uml/src/org/eclipse/capra/handler/uml/UMLHandler.java b/bundles/org.eclipse.capra.handler.uml/src/org/eclipse/capra/handler/uml/UMLHandler.java
index 8cd01ba..ecdf065 100644
--- a/bundles/org.eclipse.capra.handler.uml/src/org/eclipse/capra/handler/uml/UMLHandler.java
+++ b/bundles/org.eclipse.capra.handler.uml/src/org/eclipse/capra/handler/uml/UMLHandler.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- *   Contributors:
+ * http://www.eclipse.org/legal/epl-v20.html
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
  *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.handler.uml;
 
diff --git a/bundles/org.eclipse.capra.ui.cdt/OSGI-INF/l10n/bundle.properties b/bundles/org.eclipse.capra.ui.cdt/OSGI-INF/l10n/bundle.properties
index cb485a4..71ca2da 100644
--- a/bundles/org.eclipse.capra.ui.cdt/OSGI-INF/l10n/bundle.properties
+++ b/bundles/org.eclipse.capra.ui.cdt/OSGI-INF/l10n/bundle.properties
@@ -1,3 +1,16 @@
+###############################################################################
+# Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v2.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v20.html
+#  
+# SPDX-License-Identifier: EPL-2.0
+#  
+# Contributors:
+#      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+#      Chalmers | University of Gothenburg - additional features, updated API
+###############################################################################
 #Properties file for org.eclipse.capra.ui.cdt
 page.name = C/C++ traces
 Bundle-Vendor = Capra Development Team
diff --git a/bundles/org.eclipse.capra.ui.cdt/build.properties b/bundles/org.eclipse.capra.ui.cdt/build.properties
index 69d09bf..f197967 100644
--- a/bundles/org.eclipse.capra.ui.cdt/build.properties
+++ b/bundles/org.eclipse.capra.ui.cdt/build.properties
@@ -1,12 +1,15 @@
 ###############################################################################
-# Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+# Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
+# http://www.eclipse.org/legal/epl-v20.html
+#  
+# SPDX-License-Identifier: EPL-2.0
+#  
 # Contributors:
-#    Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+#      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+#      Chalmers | University of Gothenburg - additional features, updated API
 ###############################################################################
 source.. = src/
 output.. = bin/
diff --git a/bundles/org.eclipse.capra.ui.cdt/plugin.xml b/bundles/org.eclipse.capra.ui.cdt/plugin.xml
index 1fcabec..10cd005 100644
--- a/bundles/org.eclipse.capra.ui.cdt/plugin.xml
+++ b/bundles/org.eclipse.capra.ui.cdt/plugin.xml
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.4"?>
 <!--
-    Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+    Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
     All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
+    are made available under the terms of the Eclipse Public License v2.0
     which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
-   
+    http://www.eclipse.org/legal/epl-v20.html
+     
+    SPDX-License-Identifier: EPL-2.0
+     
     Contributors:
-       Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+         Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+         Chalmers | University of Gothenburg - additional features, updated API
  -->
 
 <plugin>
diff --git a/bundles/org.eclipse.capra.ui.cdt/pom.xml b/bundles/org.eclipse.capra.ui.cdt/pom.xml
index 2b1efaa..eea44aa 100644
--- a/bundles/org.eclipse.capra.ui.cdt/pom.xml
+++ b/bundles/org.eclipse.capra.ui.cdt/pom.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+    Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
     All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
+    are made available under the terms of the Eclipse Public License v2.0
     which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
+    http://www.eclipse.org/legal/epl-v20.html
      
-      Contributors:
+    SPDX-License-Identifier: EPL-2.0
+     
+    Contributors:
          Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+         Chalmers | University of Gothenburg - additional features, updated API
  -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/bundles/org.eclipse.capra.ui.cdt/src/org/eclipse/capra/ui/cdt/Activator.java b/bundles/org.eclipse.capra.ui.cdt/src/org/eclipse/capra/ui/cdt/Activator.java
index fdc7b51..b2db247 100644
--- a/bundles/org.eclipse.capra.ui.cdt/src/org/eclipse/capra/ui/cdt/Activator.java
+++ b/bundles/org.eclipse.capra.ui.cdt/src/org/eclipse/capra/ui/cdt/Activator.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
+ * http://www.eclipse.org/legal/epl-v20.html
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ *  
  * Contributors:
- *    Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.ui.cdt;
 
diff --git a/bundles/org.eclipse.capra.ui.cdt/src/org/eclipse/capra/ui/cdt/preferences/CDTPreferenceInitializer.java b/bundles/org.eclipse.capra.ui.cdt/src/org/eclipse/capra/ui/cdt/preferences/CDTPreferenceInitializer.java
index c4af77c..ff3ce62 100644
--- a/bundles/org.eclipse.capra.ui.cdt/src/org/eclipse/capra/ui/cdt/preferences/CDTPreferenceInitializer.java
+++ b/bundles/org.eclipse.capra.ui.cdt/src/org/eclipse/capra/ui/cdt/preferences/CDTPreferenceInitializer.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
+ * http://www.eclipse.org/legal/epl-v20.html
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ *  
  * Contributors:
- *    Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.ui.cdt.preferences;
 
diff --git a/bundles/org.eclipse.capra.ui.cdt/src/org/eclipse/capra/ui/cdt/preferences/CDTPreferencePage.java b/bundles/org.eclipse.capra.ui.cdt/src/org/eclipse/capra/ui/cdt/preferences/CDTPreferencePage.java
index b7c6d49..2fdaea1 100644
--- a/bundles/org.eclipse.capra.ui.cdt/src/org/eclipse/capra/ui/cdt/preferences/CDTPreferencePage.java
+++ b/bundles/org.eclipse.capra.ui.cdt/src/org/eclipse/capra/ui/cdt/preferences/CDTPreferencePage.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
+ * http://www.eclipse.org/legal/epl-v20.html
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ *  
  * Contributors:
- *    Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.ui.cdt.preferences;
 
diff --git a/bundles/org.eclipse.capra.ui.drive/OSGI-INF/l10n/bundle.properties b/bundles/org.eclipse.capra.ui.drive/OSGI-INF/l10n/bundle.properties
index 557c299..a663adb 100644
--- a/bundles/org.eclipse.capra.ui.drive/OSGI-INF/l10n/bundle.properties
+++ b/bundles/org.eclipse.capra.ui.drive/OSGI-INF/l10n/bundle.properties
@@ -1,3 +1,16 @@
+###############################################################################
+# Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v2.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v20.html
+#  
+# SPDX-License-Identifier: EPL-2.0
+#  
+# Contributors:
+#      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+#      Chalmers | University of Gothenburg - additional features, updated API
+###############################################################################
 #Properties file for org.eclipse.capra.ui.drive
 category.name = Capra Traceability
 view.name = Capra Google Drive Selection
diff --git a/bundles/org.eclipse.capra.ui.drive/build.properties b/bundles/org.eclipse.capra.ui.drive/build.properties
index 4a4d6cd..9f3cbd4 100644
--- a/bundles/org.eclipse.capra.ui.drive/build.properties
+++ b/bundles/org.eclipse.capra.ui.drive/build.properties
@@ -1,3 +1,16 @@
+###############################################################################
+# Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v2.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v20.html
+#  
+# SPDX-License-Identifier: EPL-2.0
+#  
+# Contributors:
+#      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+#      Chalmers | University of Gothenburg - additional features, updated API
+###############################################################################
 source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
diff --git a/bundles/org.eclipse.capra.ui.drive/plugin.xml b/bundles/org.eclipse.capra.ui.drive/plugin.xml
index c5eb160..87dc5c3 100644
--- a/bundles/org.eclipse.capra.ui.drive/plugin.xml
+++ b/bundles/org.eclipse.capra.ui.drive/plugin.xml
@@ -1,3 +1,16 @@
+<!--
+    Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License v2.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v20.html
+     
+    SPDX-License-Identifier: EPL-2.0
+     
+    Contributors:
+         Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+         Chalmers | University of Gothenburg - additional features, updated API
+ -->
 <plugin>
    <extension
          point="org.eclipse.ui.views">
diff --git a/bundles/org.eclipse.capra.ui.drive/pom.xml b/bundles/org.eclipse.capra.ui.drive/pom.xml
index d58e0d4..45932b1 100644
--- a/bundles/org.eclipse.capra.ui.drive/pom.xml
+++ b/bundles/org.eclipse.capra.ui.drive/pom.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+    Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
     All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
+    are made available under the terms of the Eclipse Public License v2.0
     which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
+    http://www.eclipse.org/legal/epl-v20.html
      
-      Contributors:
+    SPDX-License-Identifier: EPL-2.0
+     
+    Contributors:
          Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+         Chalmers | University of Gothenburg - additional features, updated API
  -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/bundles/org.eclipse.capra.ui.drive/src/org/eclipse/capra/ui/drive/CapraGoogleDriveView.java b/bundles/org.eclipse.capra.ui.drive/src/org/eclipse/capra/ui/drive/CapraGoogleDriveView.java
index 8ad2ea7..4f229d1 100644
--- a/bundles/org.eclipse.capra.ui.drive/src/org/eclipse/capra/ui/drive/CapraGoogleDriveView.java
+++ b/bundles/org.eclipse.capra.ui.drive/src/org/eclipse/capra/ui/drive/CapraGoogleDriveView.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
+ * http://www.eclipse.org/legal/epl-v20.html
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ *  
  * Contributors:
- * 	   Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.ui.drive;
 
diff --git a/bundles/org.eclipse.capra.ui.drive/src/org/eclipse/capra/ui/drive/OpenInBrowserHandler.java b/bundles/org.eclipse.capra.ui.drive/src/org/eclipse/capra/ui/drive/OpenInBrowserHandler.java
index f618d2c..29563eb 100644
--- a/bundles/org.eclipse.capra.ui.drive/src/org/eclipse/capra/ui/drive/OpenInBrowserHandler.java
+++ b/bundles/org.eclipse.capra.ui.drive/src/org/eclipse/capra/ui/drive/OpenInBrowserHandler.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
+ * http://www.eclipse.org/legal/epl-v20.html
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ *  
  * Contributors:
- * 	   Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.ui.drive;
 
diff --git a/bundles/org.eclipse.capra.ui.drive/src/org/eclipse/capra/ui/drive/OpenInOfficeViewHandler.java b/bundles/org.eclipse.capra.ui.drive/src/org/eclipse/capra/ui/drive/OpenInOfficeViewHandler.java
index a457376..b398373 100644
--- a/bundles/org.eclipse.capra.ui.drive/src/org/eclipse/capra/ui/drive/OpenInOfficeViewHandler.java
+++ b/bundles/org.eclipse.capra.ui.drive/src/org/eclipse/capra/ui/drive/OpenInOfficeViewHandler.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
+ * http://www.eclipse.org/legal/epl-v20.html
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ *  
  * Contributors:
- * 	   Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.ui.drive;
 
diff --git a/bundles/org.eclipse.capra.ui.jdt/OSGI-INF/l10n/bundle.properties b/bundles/org.eclipse.capra.ui.jdt/OSGI-INF/l10n/bundle.properties
index a7d49d8..d08b8b8 100644
--- a/bundles/org.eclipse.capra.ui.jdt/OSGI-INF/l10n/bundle.properties
+++ b/bundles/org.eclipse.capra.ui.jdt/OSGI-INF/l10n/bundle.properties
@@ -1,3 +1,16 @@
+###############################################################################
+# Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v2.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v20.html
+#  
+# SPDX-License-Identifier: EPL-2.0
+#  
+# Contributors:
+#      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+#      Chalmers | University of Gothenburg - additional features, updated API
+###############################################################################
 #Properties file for org.eclipse.capra.ui.jdt
 page.name = Java traces
 Bundle-Vendor = Capra Development Team
diff --git a/bundles/org.eclipse.capra.ui.jdt/build.properties b/bundles/org.eclipse.capra.ui.jdt/build.properties
index 69d09bf..f197967 100644
--- a/bundles/org.eclipse.capra.ui.jdt/build.properties
+++ b/bundles/org.eclipse.capra.ui.jdt/build.properties
@@ -1,12 +1,15 @@
 ###############################################################################
-# Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+# Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
+# http://www.eclipse.org/legal/epl-v20.html
+#  
+# SPDX-License-Identifier: EPL-2.0
+#  
 # Contributors:
-#    Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+#      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+#      Chalmers | University of Gothenburg - additional features, updated API
 ###############################################################################
 source.. = src/
 output.. = bin/
diff --git a/bundles/org.eclipse.capra.ui.jdt/plugin.xml b/bundles/org.eclipse.capra.ui.jdt/plugin.xml
index c41be6d..14d202f 100644
--- a/bundles/org.eclipse.capra.ui.jdt/plugin.xml
+++ b/bundles/org.eclipse.capra.ui.jdt/plugin.xml
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.4"?>
 <!--
-    Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+    Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
     All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
+    are made available under the terms of the Eclipse Public License v2.0
     which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
-   
+    http://www.eclipse.org/legal/epl-v20.html
+     
+    SPDX-License-Identifier: EPL-2.0
+     
     Contributors:
-       Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+         Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+         Chalmers | University of Gothenburg - additional features, updated API
  -->
 
 <plugin>
diff --git a/bundles/org.eclipse.capra.ui.jdt/pom.xml b/bundles/org.eclipse.capra.ui.jdt/pom.xml
index 839b18d..00b47cc 100644
--- a/bundles/org.eclipse.capra.ui.jdt/pom.xml
+++ b/bundles/org.eclipse.capra.ui.jdt/pom.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+    Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
     All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
+    are made available under the terms of the Eclipse Public License v2.0
     which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
+    http://www.eclipse.org/legal/epl-v20.html
      
-      Contributors:
+    SPDX-License-Identifier: EPL-2.0
+     
+    Contributors:
          Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+         Chalmers | University of Gothenburg - additional features, updated API
  -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/bundles/org.eclipse.capra.ui.jdt/src/org/eclipse/capra/ui/jdt/Activator.java b/bundles/org.eclipse.capra.ui.jdt/src/org/eclipse/capra/ui/jdt/Activator.java
index c3f8da7..62567df 100644
--- a/bundles/org.eclipse.capra.ui.jdt/src/org/eclipse/capra/ui/jdt/Activator.java
+++ b/bundles/org.eclipse.capra.ui.jdt/src/org/eclipse/capra/ui/jdt/Activator.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
+ * http://www.eclipse.org/legal/epl-v20.html
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ *  
  * Contributors:
- *    Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.ui.jdt;
 
diff --git a/bundles/org.eclipse.capra.ui.jdt/src/org/eclipse/capra/ui/jdt/preferences/JDTPreferenceInitializer.java b/bundles/org.eclipse.capra.ui.jdt/src/org/eclipse/capra/ui/jdt/preferences/JDTPreferenceInitializer.java
index b8c158c..41cba77 100644
--- a/bundles/org.eclipse.capra.ui.jdt/src/org/eclipse/capra/ui/jdt/preferences/JDTPreferenceInitializer.java
+++ b/bundles/org.eclipse.capra.ui.jdt/src/org/eclipse/capra/ui/jdt/preferences/JDTPreferenceInitializer.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
+ * http://www.eclipse.org/legal/epl-v20.html
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ *  
  * Contributors:
- *    Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.ui.jdt.preferences;
 
diff --git a/bundles/org.eclipse.capra.ui.jdt/src/org/eclipse/capra/ui/jdt/preferences/JDTPreferencePage.java b/bundles/org.eclipse.capra.ui.jdt/src/org/eclipse/capra/ui/jdt/preferences/JDTPreferencePage.java
index 11dc2e8..1af06b9 100644
--- a/bundles/org.eclipse.capra.ui.jdt/src/org/eclipse/capra/ui/jdt/preferences/JDTPreferencePage.java
+++ b/bundles/org.eclipse.capra.ui.jdt/src/org/eclipse/capra/ui/jdt/preferences/JDTPreferencePage.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
+ * http://www.eclipse.org/legal/epl-v20.html
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ *  
  * Contributors:
- *    Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.ui.jdt.preferences;
 
diff --git a/bundles/org.eclipse.capra.ui.notification/OSGI-INF/l10n/bundle.properties b/bundles/org.eclipse.capra.ui.notification/OSGI-INF/l10n/bundle.properties
index 3b769e0..5f9aff3 100644
--- a/bundles/org.eclipse.capra.ui.notification/OSGI-INF/l10n/bundle.properties
+++ b/bundles/org.eclipse.capra.ui.notification/OSGI-INF/l10n/bundle.properties
@@ -1,3 +1,16 @@
+###############################################################################
+# Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v2.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v20.html
+#  
+# SPDX-License-Identifier: EPL-2.0
+#  
+# Contributors:
+#      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+#      Chalmers | University of Gothenburg - additional features, updated API
+###############################################################################
 #Properties file for org.eclipse.capra.ui.notification
 extension.name = Capra Issues
 Bundle-Vendor = Capra Development Team
diff --git a/bundles/org.eclipse.capra.ui.notification/build.properties b/bundles/org.eclipse.capra.ui.notification/build.properties
index a407165..f197967 100644
--- a/bundles/org.eclipse.capra.ui.notification/build.properties
+++ b/bundles/org.eclipse.capra.ui.notification/build.properties
@@ -1,12 +1,15 @@
 ###############################################################################
-# Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+# Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #  
-#   Contributors:
+# SPDX-License-Identifier: EPL-2.0
+#  
+# Contributors:
 #      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+#      Chalmers | University of Gothenburg - additional features, updated API
 ###############################################################################
 source.. = src/
 output.. = bin/
diff --git a/bundles/org.eclipse.capra.ui.notification/plugin.xml b/bundles/org.eclipse.capra.ui.notification/plugin.xml
index 17b53ce..505108e 100644
--- a/bundles/org.eclipse.capra.ui.notification/plugin.xml
+++ b/bundles/org.eclipse.capra.ui.notification/plugin.xml
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.4"?>
 <!--
-    Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+    Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
     All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
+    are made available under the terms of the Eclipse Public License v2.0
     which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
+    http://www.eclipse.org/legal/epl-v20.html
      
-      Contributors:
+    SPDX-License-Identifier: EPL-2.0
+     
+    Contributors:
          Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+         Chalmers | University of Gothenburg - additional features, updated API
  -->
 
 <plugin>
diff --git a/bundles/org.eclipse.capra.ui.notification/pom.xml b/bundles/org.eclipse.capra.ui.notification/pom.xml
index fc228e6..2135b1b 100644
--- a/bundles/org.eclipse.capra.ui.notification/pom.xml
+++ b/bundles/org.eclipse.capra.ui.notification/pom.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+    Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
     All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
+    are made available under the terms of the Eclipse Public License v2.0
     which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
+    http://www.eclipse.org/legal/epl-v20.html
      
-      Contributors:
+    SPDX-License-Identifier: EPL-2.0
+     
+    Contributors:
          Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+         Chalmers | University of Gothenburg - additional features, updated API
  -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/bundles/org.eclipse.capra.ui.notification/src/org/eclipse/capra/ui/notification/CapraNotificationHelper.java b/bundles/org.eclipse.capra.ui.notification/src/org/eclipse/capra/ui/notification/CapraNotificationHelper.java
index 2c62e4c..68b2274 100644
--- a/bundles/org.eclipse.capra.ui.notification/src/org/eclipse/capra/ui/notification/CapraNotificationHelper.java
+++ b/bundles/org.eclipse.capra.ui.notification/src/org/eclipse/capra/ui/notification/CapraNotificationHelper.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- *  Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v20.html
  *  
- *   Contributors:
- *      Chalmers|Gothenburg University and rt-labs - initial API and implementation and/or initial documentation
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
+ *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.ui.notification;
 
diff --git a/bundles/org.eclipse.capra.ui.notification/src/org/eclipse/capra/ui/notification/ChangeQuickFix.java b/bundles/org.eclipse.capra.ui.notification/src/org/eclipse/capra/ui/notification/ChangeQuickFix.java
index 6b37f32..3b60d7b 100644
--- a/bundles/org.eclipse.capra.ui.notification/src/org/eclipse/capra/ui/notification/ChangeQuickFix.java
+++ b/bundles/org.eclipse.capra.ui.notification/src/org/eclipse/capra/ui/notification/ChangeQuickFix.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- *  Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v20.html
  *  
- *   Contributors:
- *      Chalmers|Gothenburg University and rt-labs - initial API and implementation and/or initial documentation
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
+ *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.ui.notification;
 
diff --git a/bundles/org.eclipse.capra.ui.notification/src/org/eclipse/capra/ui/notification/DeleteQuickFix.java b/bundles/org.eclipse.capra.ui.notification/src/org/eclipse/capra/ui/notification/DeleteQuickFix.java
index 757250c..ececf7f 100644
--- a/bundles/org.eclipse.capra.ui.notification/src/org/eclipse/capra/ui/notification/DeleteQuickFix.java
+++ b/bundles/org.eclipse.capra.ui.notification/src/org/eclipse/capra/ui/notification/DeleteQuickFix.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- *   Contributors:
+ * http://www.eclipse.org/legal/epl-v20.html
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
  *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 
 package org.eclipse.capra.ui.notification;
diff --git a/bundles/org.eclipse.capra.ui.notification/src/org/eclipse/capra/ui/notification/MarkerResolutionGenerator.java b/bundles/org.eclipse.capra.ui.notification/src/org/eclipse/capra/ui/notification/MarkerResolutionGenerator.java
index 3228f2a..f3743fd 100644
--- a/bundles/org.eclipse.capra.ui.notification/src/org/eclipse/capra/ui/notification/MarkerResolutionGenerator.java
+++ b/bundles/org.eclipse.capra.ui.notification/src/org/eclipse/capra/ui/notification/MarkerResolutionGenerator.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *  
- *   Contributors:
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
  *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.ui.notification;
 
diff --git a/bundles/org.eclipse.capra.ui.notification/src/org/eclipse/capra/ui/notification/RenameOrMoveQuickFix.java b/bundles/org.eclipse.capra.ui.notification/src/org/eclipse/capra/ui/notification/RenameOrMoveQuickFix.java
index 5f91c30..0144906 100644
--- a/bundles/org.eclipse.capra.ui.notification/src/org/eclipse/capra/ui/notification/RenameOrMoveQuickFix.java
+++ b/bundles/org.eclipse.capra.ui.notification/src/org/eclipse/capra/ui/notification/RenameOrMoveQuickFix.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- *   Contributors:
+ * http://www.eclipse.org/legal/epl-v20.html
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
  *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.ui.notification;
 
diff --git a/bundles/org.eclipse.capra.ui.office/OSGI-INF/l10n/bundle.properties b/bundles/org.eclipse.capra.ui.office/OSGI-INF/l10n/bundle.properties
index 5ebe643..c0ee92a 100644
--- a/bundles/org.eclipse.capra.ui.office/OSGI-INF/l10n/bundle.properties
+++ b/bundles/org.eclipse.capra.ui.office/OSGI-INF/l10n/bundle.properties
@@ -1,3 +1,16 @@
+###############################################################################
+# Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v2.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v20.html
+#  
+# SPDX-License-Identifier: EPL-2.0
+#  
+# Contributors:
+#      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+#      Chalmers | University of Gothenburg - additional features, updated API
+###############################################################################
 #Properties file for org.eclipse.capra.ui.office
 category.name = Capra Traceability
 view.name = Capra Office Selection
diff --git a/bundles/org.eclipse.capra.ui.office/build.properties b/bundles/org.eclipse.capra.ui.office/build.properties
index 80191fd..01f75a3 100644
--- a/bundles/org.eclipse.capra.ui.office/build.properties
+++ b/bundles/org.eclipse.capra.ui.office/build.properties
@@ -1,12 +1,15 @@
 ###############################################################################
-# Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+# Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #  
-#   Contributors:
+# SPDX-License-Identifier: EPL-2.0
+#  
+# Contributors:
 #      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+#      Chalmers | University of Gothenburg - additional features, updated API
 ###############################################################################
 source.. = src/
 bin.includes = META-INF/,\
diff --git a/bundles/org.eclipse.capra.ui.office/plugin.xml b/bundles/org.eclipse.capra.ui.office/plugin.xml
index e6d7ac7..8ef7112 100644
--- a/bundles/org.eclipse.capra.ui.office/plugin.xml
+++ b/bundles/org.eclipse.capra.ui.office/plugin.xml
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.4"?>
 <!--
-    Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+    Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
     All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
+    are made available under the terms of the Eclipse Public License v2.0
     which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
-
-      Contributors:
+    http://www.eclipse.org/legal/epl-v20.html
+     
+    SPDX-License-Identifier: EPL-2.0
+     
+    Contributors:
          Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+         Chalmers | University of Gothenburg - additional features, updated API
  -->
 
 <plugin>
diff --git a/bundles/org.eclipse.capra.ui.office/pom.xml b/bundles/org.eclipse.capra.ui.office/pom.xml
index 63a545c..dca1f14 100644
--- a/bundles/org.eclipse.capra.ui.office/pom.xml
+++ b/bundles/org.eclipse.capra.ui.office/pom.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+    Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
     All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
+    are made available under the terms of the Eclipse Public License v2.0
     which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
+    http://www.eclipse.org/legal/epl-v20.html
      
-      Contributors:
+    SPDX-License-Identifier: EPL-2.0
+     
+    Contributors:
          Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+         Chalmers | University of Gothenburg - additional features, updated API
  -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/Activator.java b/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/Activator.java
index 7d123ce..65bf5d9 100644
--- a/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/Activator.java
+++ b/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/Activator.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
+ * http://www.eclipse.org/legal/epl-v20.html
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ *  
  * Contributors:
- * 	   Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 
 package org.eclipse.capra.ui.office;
diff --git a/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/exceptions/CapraOfficeFileNotSupportedException.java b/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/exceptions/CapraOfficeFileNotSupportedException.java
index b99b3d6..2805da5 100644
--- a/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/exceptions/CapraOfficeFileNotSupportedException.java
+++ b/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/exceptions/CapraOfficeFileNotSupportedException.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
+ * http://www.eclipse.org/legal/epl-v20.html
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ *  
  * Contributors:
- * 	   Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 
 package org.eclipse.capra.ui.office.exceptions;
diff --git a/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/exceptions/CapraOfficeObjectNotFound.java b/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/exceptions/CapraOfficeObjectNotFound.java
index 1545dd2..79a2c6e 100644
--- a/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/exceptions/CapraOfficeObjectNotFound.java
+++ b/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/exceptions/CapraOfficeObjectNotFound.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
+ * http://www.eclipse.org/legal/epl-v20.html
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ *  
  * Contributors:
- * 	   Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 
 package org.eclipse.capra.ui.office.exceptions;
diff --git a/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/handlers/ClearSelectionHandler.java b/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/handlers/ClearSelectionHandler.java
index 839239a..1f2a932 100644
--- a/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/handlers/ClearSelectionHandler.java
+++ b/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/handlers/ClearSelectionHandler.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
+ * http://www.eclipse.org/legal/epl-v20.html
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ *  
  * Contributors:
- * 	    Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 
 package org.eclipse.capra.ui.office.handlers;
diff --git a/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/handlers/OpenFileHandler.java b/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/handlers/OpenFileHandler.java
index 78cd281..05dcb9a 100644
--- a/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/handlers/OpenFileHandler.java
+++ b/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/handlers/OpenFileHandler.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
+ * http://www.eclipse.org/legal/epl-v20.html
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ *  
  * Contributors:
- * 	   Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 
 package org.eclipse.capra.ui.office.handlers;
diff --git a/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/handlers/ShowObjectDetailsHandler.java b/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/handlers/ShowObjectDetailsHandler.java
index 5dcb070..86874bc 100644
--- a/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/handlers/ShowObjectDetailsHandler.java
+++ b/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/handlers/ShowObjectDetailsHandler.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
+ * http://www.eclipse.org/legal/epl-v20.html
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ *  
  * Contributors:
- * 	   Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 
 package org.eclipse.capra.ui.office.handlers;
diff --git a/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/model/CapraExcelRow.java b/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/model/CapraExcelRow.java
index f5f39d6..0d49c51 100644
--- a/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/model/CapraExcelRow.java
+++ b/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/model/CapraExcelRow.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
+ * http://www.eclipse.org/legal/epl-v20.html
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ *  
  * Contributors:
- * 	   Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.ui.office.model;
 
diff --git a/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/model/CapraGoogleSheetsRow.java b/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/model/CapraGoogleSheetsRow.java
index e0d8c12..c28e94f 100644
--- a/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/model/CapraGoogleSheetsRow.java
+++ b/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/model/CapraGoogleSheetsRow.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
+ * http://www.eclipse.org/legal/epl-v20.html
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ *  
  * Contributors:
- * 	   Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.ui.office.model;
 
diff --git a/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/model/CapraOfficeObject.java b/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/model/CapraOfficeObject.java
index f417508..ab09851 100644
--- a/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/model/CapraOfficeObject.java
+++ b/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/model/CapraOfficeObject.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
+ * http://www.eclipse.org/legal/epl-v20.html
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ *  
  * Contributors:
- * 	   Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 
 package org.eclipse.capra.ui.office.model;
diff --git a/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/model/CapraWordRequirement.java b/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/model/CapraWordRequirement.java
index 0c4abe7..633963c 100644
--- a/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/model/CapraWordRequirement.java
+++ b/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/model/CapraWordRequirement.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
+ * http://www.eclipse.org/legal/epl-v20.html
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ *  
  * Contributors:
- * 	   Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 
 package org.eclipse.capra.ui.office.model;
diff --git a/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/preferences/OfficePreferences.java b/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/preferences/OfficePreferences.java
index 57865e3..6109fc9 100644
--- a/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/preferences/OfficePreferences.java
+++ b/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/preferences/OfficePreferences.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
+ * http://www.eclipse.org/legal/epl-v20.html
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ *  
  * Contributors:
- * 	   Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 
 package org.eclipse.capra.ui.office.preferences;
diff --git a/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/preferences/PreferenceInitializer.java b/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/preferences/PreferenceInitializer.java
index 082bae5..b726176 100644
--- a/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/preferences/PreferenceInitializer.java
+++ b/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/preferences/PreferenceInitializer.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
+ * http://www.eclipse.org/legal/epl-v20.html
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ *  
  * Contributors:
- * 	   Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 
 package org.eclipse.capra.ui.office.preferences;
diff --git a/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/utils/CapraOfficeUtils.java b/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/utils/CapraOfficeUtils.java
index 98837a6..b9c1d0f 100644
--- a/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/utils/CapraOfficeUtils.java
+++ b/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/utils/CapraOfficeUtils.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
+ * http://www.eclipse.org/legal/epl-v20.html
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ *  
  * Contributors:
- * 	   Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 
 package org.eclipse.capra.ui.office.utils;
diff --git a/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/utils/OfficePropertyTester.java b/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/utils/OfficePropertyTester.java
index 96ecdd9..f0a6dc7 100644
--- a/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/utils/OfficePropertyTester.java
+++ b/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/utils/OfficePropertyTester.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
+ * http://www.eclipse.org/legal/epl-v20.html
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ *  
  * Contributors:
- * 	   Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 
 package org.eclipse.capra.ui.office.utils;
diff --git a/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/utils/OfficeSourceProvider.java b/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/utils/OfficeSourceProvider.java
index a30a702..d38cff2 100644
--- a/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/utils/OfficeSourceProvider.java
+++ b/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/utils/OfficeSourceProvider.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
+ * http://www.eclipse.org/legal/epl-v20.html
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ *  
  * Contributors:
- * 	   Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 
 package org.eclipse.capra.ui.office.utils;
diff --git a/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/utils/OfficeTransferType.java b/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/utils/OfficeTransferType.java
index cb30458..e9f1745 100644
--- a/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/utils/OfficeTransferType.java
+++ b/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/utils/OfficeTransferType.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
+ * http://www.eclipse.org/legal/epl-v20.html
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ *  
  * Contributors:
- * 	   Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 
 package org.eclipse.capra.ui.office.utils;
diff --git a/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/views/OfficeView.java b/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/views/OfficeView.java
index 8d6331e..c8ae602 100644
--- a/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/views/OfficeView.java
+++ b/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/views/OfficeView.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
+ * http://www.eclipse.org/legal/epl-v20.html
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ *  
  * Contributors:
- * 	   Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 
 package org.eclipse.capra.ui.office.views;
diff --git a/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/views/SelectSheetDynamicMenu.java b/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/views/SelectSheetDynamicMenu.java
index ceabf09..e742e32 100644
--- a/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/views/SelectSheetDynamicMenu.java
+++ b/bundles/org.eclipse.capra.ui.office/src/org/eclipse/capra/ui/office/views/SelectSheetDynamicMenu.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
+ * http://www.eclipse.org/legal/epl-v20.html
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ *  
  * Contributors:
- * 	   Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 
 package org.eclipse.capra.ui.office.views;
diff --git a/bundles/org.eclipse.capra.ui.plantuml/OSGI-INF/l10n/bundle.properties b/bundles/org.eclipse.capra.ui.plantuml/OSGI-INF/l10n/bundle.properties
index c8ae963..da5bc53 100644
--- a/bundles/org.eclipse.capra.ui.plantuml/OSGI-INF/l10n/bundle.properties
+++ b/bundles/org.eclipse.capra.ui.plantuml/OSGI-INF/l10n/bundle.properties
@@ -1,3 +1,16 @@
+###############################################################################
+# Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v2.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v20.html
+#  
+# SPDX-License-Identifier: EPL-2.0
+#  
+# Contributors:
+#      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+#      Chalmers | University of Gothenburg - additional features, updated API
+###############################################################################
 #Properties file for org.eclipse.capra.ui.plantuml
 command.name.transitivity = Toggle Transitivity
 command.label.transitivity = Show transitive links
diff --git a/bundles/org.eclipse.capra.ui.plantuml/build.properties b/bundles/org.eclipse.capra.ui.plantuml/build.properties
index e4a9e6d..82ec81b 100644
--- a/bundles/org.eclipse.capra.ui.plantuml/build.properties
+++ b/bundles/org.eclipse.capra.ui.plantuml/build.properties
@@ -1,12 +1,15 @@
 ###############################################################################
-# Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+# Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #  
-#   Contributors:
+# SPDX-License-Identifier: EPL-2.0
+#  
+# Contributors:
 #      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+#      Chalmers | University of Gothenburg - additional features, updated API
 ###############################################################################
 source.. = xtend-gen/,\
            src/
diff --git a/bundles/org.eclipse.capra.ui.plantuml/plugin.xml b/bundles/org.eclipse.capra.ui.plantuml/plugin.xml
index afcbfd8..1a783a9 100644
--- a/bundles/org.eclipse.capra.ui.plantuml/plugin.xml
+++ b/bundles/org.eclipse.capra.ui.plantuml/plugin.xml
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.4"?>
 <!--
-    Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+    Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
     All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
+    are made available under the terms of the Eclipse Public License v2.0
     which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
+    http://www.eclipse.org/legal/epl-v20.html
      
-      Contributors:
+    SPDX-License-Identifier: EPL-2.0
+     
+    Contributors:
          Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+         Chalmers | University of Gothenburg - additional features, updated API
  -->
 
 <plugin>
diff --git a/bundles/org.eclipse.capra.ui.plantuml/pom.xml b/bundles/org.eclipse.capra.ui.plantuml/pom.xml
index 1ca1e79..a81ba88 100644
--- a/bundles/org.eclipse.capra.ui.plantuml/pom.xml
+++ b/bundles/org.eclipse.capra.ui.plantuml/pom.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+    Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
     All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
+    are made available under the terms of the Eclipse Public License v2.0
     which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
+    http://www.eclipse.org/legal/epl-v20.html
      
-      Contributors:
+    SPDX-License-Identifier: EPL-2.0
+     
+    Contributors:
          Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+         Chalmers | University of Gothenburg - additional features, updated API
  -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/bundles/org.eclipse.capra.ui.plantuml/src/org/eclipse/capra/ui/plantuml/Connections.java b/bundles/org.eclipse.capra.ui.plantuml/src/org/eclipse/capra/ui/plantuml/Connections.java
index b057ff0..0e9f60f 100644
--- a/bundles/org.eclipse.capra.ui.plantuml/src/org/eclipse/capra/ui/plantuml/Connections.java
+++ b/bundles/org.eclipse.capra.ui.plantuml/src/org/eclipse/capra/ui/plantuml/Connections.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- *   Contributors:
+ * http://www.eclipse.org/legal/epl-v20.html
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
  *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.ui.plantuml;
 
diff --git a/bundles/org.eclipse.capra.ui.plantuml/src/org/eclipse/capra/ui/plantuml/DiagramTextProviderHandler.java b/bundles/org.eclipse.capra.ui.plantuml/src/org/eclipse/capra/ui/plantuml/DiagramTextProviderHandler.java
index 480c1fc..1ff2887 100644
--- a/bundles/org.eclipse.capra.ui.plantuml/src/org/eclipse/capra/ui/plantuml/DiagramTextProviderHandler.java
+++ b/bundles/org.eclipse.capra.ui.plantuml/src/org/eclipse/capra/ui/plantuml/DiagramTextProviderHandler.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- *   Contributors:
+ * http://www.eclipse.org/legal/epl-v20.html
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
  *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.ui.plantuml;
 
diff --git a/bundles/org.eclipse.capra.ui.plantuml/src/org/eclipse/capra/ui/plantuml/DisplayInternalLinksHandler.java b/bundles/org.eclipse.capra.ui.plantuml/src/org/eclipse/capra/ui/plantuml/DisplayInternalLinksHandler.java
index dba5629..8b7eead 100644
--- a/bundles/org.eclipse.capra.ui.plantuml/src/org/eclipse/capra/ui/plantuml/DisplayInternalLinksHandler.java
+++ b/bundles/org.eclipse.capra.ui.plantuml/src/org/eclipse/capra/ui/plantuml/DisplayInternalLinksHandler.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *  
- *   Contributors:
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
  *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.ui.plantuml;
 
diff --git a/bundles/org.eclipse.capra.ui.plantuml/src/org/eclipse/capra/ui/plantuml/SelectRelationshipsHandler.java b/bundles/org.eclipse.capra.ui.plantuml/src/org/eclipse/capra/ui/plantuml/SelectRelationshipsHandler.java
index 9f2ab0f..68052e7 100644
--- a/bundles/org.eclipse.capra.ui.plantuml/src/org/eclipse/capra/ui/plantuml/SelectRelationshipsHandler.java
+++ b/bundles/org.eclipse.capra.ui.plantuml/src/org/eclipse/capra/ui/plantuml/SelectRelationshipsHandler.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *  
- *   Contributors:
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
  *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.ui.plantuml;
 
diff --git a/bundles/org.eclipse.capra.ui.plantuml/src/org/eclipse/capra/ui/plantuml/ToggleDisplayGraphHandler.java b/bundles/org.eclipse.capra.ui.plantuml/src/org/eclipse/capra/ui/plantuml/ToggleDisplayGraphHandler.java
index 1a760b9..00e9531 100644
--- a/bundles/org.eclipse.capra.ui.plantuml/src/org/eclipse/capra/ui/plantuml/ToggleDisplayGraphHandler.java
+++ b/bundles/org.eclipse.capra.ui.plantuml/src/org/eclipse/capra/ui/plantuml/ToggleDisplayGraphHandler.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *  
- *   Contributors:
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
  *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.ui.plantuml;
 
diff --git a/bundles/org.eclipse.capra.ui.plantuml/src/org/eclipse/capra/ui/plantuml/ToggleTransitivityHandler.java b/bundles/org.eclipse.capra.ui.plantuml/src/org/eclipse/capra/ui/plantuml/ToggleTransitivityHandler.java
index 10e225b..54829df 100644
--- a/bundles/org.eclipse.capra.ui.plantuml/src/org/eclipse/capra/ui/plantuml/ToggleTransitivityHandler.java
+++ b/bundles/org.eclipse.capra.ui.plantuml/src/org/eclipse/capra/ui/plantuml/ToggleTransitivityHandler.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- *   Contributors:
+ * http://www.eclipse.org/legal/epl-v20.html
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
  *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.ui.plantuml;
 
diff --git a/bundles/org.eclipse.capra.ui.plantuml/src/org/eclipse/capra/ui/plantuml/TransitivityDepthHandler.java b/bundles/org.eclipse.capra.ui.plantuml/src/org/eclipse/capra/ui/plantuml/TransitivityDepthHandler.java
index 0bc8beb..24c713d 100644
--- a/bundles/org.eclipse.capra.ui.plantuml/src/org/eclipse/capra/ui/plantuml/TransitivityDepthHandler.java
+++ b/bundles/org.eclipse.capra.ui.plantuml/src/org/eclipse/capra/ui/plantuml/TransitivityDepthHandler.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *  
- *   Contributors:
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
  *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.ui.plantuml;
 
diff --git a/bundles/org.eclipse.capra.ui.plantuml/src/org/eclipse/capra/ui/plantuml/views/CapraPlantUmlView.java b/bundles/org.eclipse.capra.ui.plantuml/src/org/eclipse/capra/ui/plantuml/views/CapraPlantUmlView.java
index d7d564f..478d039 100644
--- a/bundles/org.eclipse.capra.ui.plantuml/src/org/eclipse/capra/ui/plantuml/views/CapraPlantUmlView.java
+++ b/bundles/org.eclipse.capra.ui.plantuml/src/org/eclipse/capra/ui/plantuml/views/CapraPlantUmlView.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016-2019 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- *   Contributors:
- *      Chalmers | University of Gothenburg
+ * http://www.eclipse.org/legal/epl-v20.html
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
+ *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.ui.plantuml.views;
 
diff --git a/bundles/org.eclipse.capra.ui.plantuml/xtend-gen/org/eclipse/capra/ui/plantuml/.VisualizationHelper.xtendbin b/bundles/org.eclipse.capra.ui.plantuml/xtend-gen/org/eclipse/capra/ui/plantuml/.VisualizationHelper.xtendbin
index c434150..033e150 100644
--- a/bundles/org.eclipse.capra.ui.plantuml/xtend-gen/org/eclipse/capra/ui/plantuml/.VisualizationHelper.xtendbin
+++ b/bundles/org.eclipse.capra.ui.plantuml/xtend-gen/org/eclipse/capra/ui/plantuml/.VisualizationHelper.xtendbin
Binary files differ
diff --git a/bundles/org.eclipse.capra.ui.zest/OSGI-INF/l10n/bundle.properties b/bundles/org.eclipse.capra.ui.zest/OSGI-INF/l10n/bundle.properties
index f24ffaa..e51f680 100644
--- a/bundles/org.eclipse.capra.ui.zest/OSGI-INF/l10n/bundle.properties
+++ b/bundles/org.eclipse.capra.ui.zest/OSGI-INF/l10n/bundle.properties
@@ -1,3 +1,16 @@
+###############################################################################
+# Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v2.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v20.html
+#  
+# SPDX-License-Identifier: EPL-2.0
+#  
+# Contributors:
+#      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+#      Chalmers | University of Gothenburg - additional features, updated API
+###############################################################################
 #Properties file for org.eclipse.capra.ui.zest
 view.name = Capra Trace Link Visualisation
 category.name = Capra Traceability
diff --git a/bundles/org.eclipse.capra.ui.zest/build.properties b/bundles/org.eclipse.capra.ui.zest/build.properties
index 7c917d9..abb8fa9 100644
--- a/bundles/org.eclipse.capra.ui.zest/build.properties
+++ b/bundles/org.eclipse.capra.ui.zest/build.properties
@@ -1,12 +1,15 @@
 ###############################################################################
-#  Copyright (c) 2016 Chalmers | Gothenburg University, rt-labs and others.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+# Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v2.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v20.html
 #  
-#   Contributors:
-#      Chalmers|Gothenburg University and rt-labs - initial API and implementation and/or initial documentation
+# SPDX-License-Identifier: EPL-2.0
+#  
+# Contributors:
+#      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+#      Chalmers | University of Gothenburg - additional features, updated API
 ###############################################################################
 source.. = src/
 output.. = bin/
diff --git a/bundles/org.eclipse.capra.ui.zest/plugin.xml b/bundles/org.eclipse.capra.ui.zest/plugin.xml
index 1000e90..0b9ee04 100644
--- a/bundles/org.eclipse.capra.ui.zest/plugin.xml
+++ b/bundles/org.eclipse.capra.ui.zest/plugin.xml
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.4"?>
 <!--
-    Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+    Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
     All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
+    are made available under the terms of the Eclipse Public License v2.0
     which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
+    http://www.eclipse.org/legal/epl-v20.html
      
-      Contributors:
+    SPDX-License-Identifier: EPL-2.0
+     
+    Contributors:
          Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+         Chalmers | University of Gothenburg - additional features, updated API
  -->
 <plugin>
 
diff --git a/bundles/org.eclipse.capra.ui.zest/pom.xml b/bundles/org.eclipse.capra.ui.zest/pom.xml
index fe2f540..9a3e9e3 100644
--- a/bundles/org.eclipse.capra.ui.zest/pom.xml
+++ b/bundles/org.eclipse.capra.ui.zest/pom.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+    Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
     All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
+    are made available under the terms of the Eclipse Public License v2.0
     which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
+    http://www.eclipse.org/legal/epl-v20.html
      
-      Contributors:
+    SPDX-License-Identifier: EPL-2.0
+     
+    Contributors:
          Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+         Chalmers | University of Gothenburg - additional features, updated API
  -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/bundles/org.eclipse.capra.ui.zest/src/org/eclipse/capra/ui/zest/ToggleTransitivityHandler.java b/bundles/org.eclipse.capra.ui.zest/src/org/eclipse/capra/ui/zest/ToggleTransitivityHandler.java
index 43369e8..ce5fddc 100644
--- a/bundles/org.eclipse.capra.ui.zest/src/org/eclipse/capra/ui/zest/ToggleTransitivityHandler.java
+++ b/bundles/org.eclipse.capra.ui.zest/src/org/eclipse/capra/ui/zest/ToggleTransitivityHandler.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *  
- *   Contributors:
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
  *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.ui.zest;
 
diff --git a/bundles/org.eclipse.capra.ui.zest/src/org/eclipse/capra/ui/zest/TraceNodeContentProvider.java b/bundles/org.eclipse.capra.ui.zest/src/org/eclipse/capra/ui/zest/TraceNodeContentProvider.java
index 18993bd..db76286 100644
--- a/bundles/org.eclipse.capra.ui.zest/src/org/eclipse/capra/ui/zest/TraceNodeContentProvider.java
+++ b/bundles/org.eclipse.capra.ui.zest/src/org/eclipse/capra/ui/zest/TraceNodeContentProvider.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *  
- *   Contributors:
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
  *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.ui.zest;
 
diff --git a/bundles/org.eclipse.capra.ui.zest/src/org/eclipse/capra/ui/zest/TraceNodeLabelProvider.java b/bundles/org.eclipse.capra.ui.zest/src/org/eclipse/capra/ui/zest/TraceNodeLabelProvider.java
index c580f63..f8d2eac 100644
--- a/bundles/org.eclipse.capra.ui.zest/src/org/eclipse/capra/ui/zest/TraceNodeLabelProvider.java
+++ b/bundles/org.eclipse.capra.ui.zest/src/org/eclipse/capra/ui/zest/TraceNodeLabelProvider.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *  
- *   Contributors:
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
  *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.ui.zest;
 
diff --git a/bundles/org.eclipse.capra.ui.zest/src/org/eclipse/capra/ui/zest/ZestView.java b/bundles/org.eclipse.capra.ui.zest/src/org/eclipse/capra/ui/zest/ZestView.java
index 773b480..d74a8ac 100644
--- a/bundles/org.eclipse.capra.ui.zest/src/org/eclipse/capra/ui/zest/ZestView.java
+++ b/bundles/org.eclipse.capra.ui.zest/src/org/eclipse/capra/ui/zest/ZestView.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- *   Contributors:
+ * http://www.eclipse.org/legal/epl-v20.html
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
  *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.ui.zest;
 
diff --git a/bundles/org.eclipse.capra.ui/OSGI-INF/l10n/bundle.properties b/bundles/org.eclipse.capra.ui/OSGI-INF/l10n/bundle.properties
index 92fcbe8..0041d37 100644
--- a/bundles/org.eclipse.capra.ui/OSGI-INF/l10n/bundle.properties
+++ b/bundles/org.eclipse.capra.ui/OSGI-INF/l10n/bundle.properties
@@ -1,3 +1,16 @@
+###############################################################################
+# Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v2.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v20.html
+#  
+# SPDX-License-Identifier: EPL-2.0
+#  
+# Contributors:
+#      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+#      Chalmers | University of Gothenburg - additional features, updated API
+###############################################################################
 #Properties file for org.eclipse.capra.ui
 command.name = Create Trace
 command.label = Create Trace
diff --git a/bundles/org.eclipse.capra.ui/build.properties b/bundles/org.eclipse.capra.ui/build.properties
index ac59cf1..20984d2 100644
--- a/bundles/org.eclipse.capra.ui/build.properties
+++ b/bundles/org.eclipse.capra.ui/build.properties
@@ -1,12 +1,15 @@
 ###############################################################################
-# Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+# Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #  
-#   Contributors:
+# SPDX-License-Identifier: EPL-2.0
+#  
+# Contributors:
 #      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+#      Chalmers | University of Gothenburg - additional features, updated API
 ###############################################################################
 source.. = src/
 output.. = bin/
diff --git a/bundles/org.eclipse.capra.ui/contexts.xml b/bundles/org.eclipse.capra.ui/contexts.xml
index aa75860..dedb1d1 100644
--- a/bundles/org.eclipse.capra.ui/contexts.xml
+++ b/bundles/org.eclipse.capra.ui/contexts.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+    Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
     All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
+    are made available under the terms of the Eclipse Public License v2.0
     which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
+    http://www.eclipse.org/legal/epl-v20.html
      
-      Contributors:
+    SPDX-License-Identifier: EPL-2.0
+     
+    Contributors:
          Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+         Chalmers | University of Gothenburg - additional features, updated API
  -->
 
 <contexts>
diff --git a/bundles/org.eclipse.capra.ui/plugin.xml b/bundles/org.eclipse.capra.ui/plugin.xml
index 41221eb..5e3a1a4 100644
--- a/bundles/org.eclipse.capra.ui/plugin.xml
+++ b/bundles/org.eclipse.capra.ui/plugin.xml
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.4"?>
 <!--
-    Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+    Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
     All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
+    are made available under the terms of the Eclipse Public License v2.0
     which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
+    http://www.eclipse.org/legal/epl-v20.html
      
-      Contributors:
+    SPDX-License-Identifier: EPL-2.0
+     
+    Contributors:
          Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+         Chalmers | University of Gothenburg - additional features, updated API
  -->
 
 <plugin>
diff --git a/bundles/org.eclipse.capra.ui/pom.xml b/bundles/org.eclipse.capra.ui/pom.xml
index 6baf67e..0e26f02 100644
--- a/bundles/org.eclipse.capra.ui/pom.xml
+++ b/bundles/org.eclipse.capra.ui/pom.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+    Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
     All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
+    are made available under the terms of the Eclipse Public License v2.0
     which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
+    http://www.eclipse.org/legal/epl-v20.html
      
-      Contributors:
+    SPDX-License-Identifier: EPL-2.0
+     
+    Contributors:
          Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+         Chalmers | University of Gothenburg - additional features, updated API
  -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/bundles/org.eclipse.capra.ui/src/org/eclipse/capra/ui/handlers/TraceCreationHandler.java b/bundles/org.eclipse.capra.ui/src/org/eclipse/capra/ui/handlers/TraceCreationHandler.java
index a7d60e1..8f8ec67 100644
--- a/bundles/org.eclipse.capra.ui/src/org/eclipse/capra/ui/handlers/TraceCreationHandler.java
+++ b/bundles/org.eclipse.capra.ui/src/org/eclipse/capra/ui/handlers/TraceCreationHandler.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- *   Contributors:
+ * http://www.eclipse.org/legal/epl-v20.html
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
  *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.ui.handlers;
 
diff --git a/bundles/org.eclipse.capra.ui/src/org/eclipse/capra/ui/handlers/selection/AddtoSelection.java b/bundles/org.eclipse.capra.ui/src/org/eclipse/capra/ui/handlers/selection/AddtoSelection.java
index 3485ddb..1a04062 100644
--- a/bundles/org.eclipse.capra.ui/src/org/eclipse/capra/ui/handlers/selection/AddtoSelection.java
+++ b/bundles/org.eclipse.capra.ui/src/org/eclipse/capra/ui/handlers/selection/AddtoSelection.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *  
- *   Contributors:
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
  *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.ui.handlers.selection;
 
diff --git a/bundles/org.eclipse.capra.ui/src/org/eclipse/capra/ui/handlers/selection/ClearSelectionHandler.java b/bundles/org.eclipse.capra.ui/src/org/eclipse/capra/ui/handlers/selection/ClearSelectionHandler.java
index ec9d047..6c61993 100644
--- a/bundles/org.eclipse.capra.ui/src/org/eclipse/capra/ui/handlers/selection/ClearSelectionHandler.java
+++ b/bundles/org.eclipse.capra.ui/src/org/eclipse/capra/ui/handlers/selection/ClearSelectionHandler.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *  
- *   Contributors:
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
  *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.ui.handlers.selection;
 
diff --git a/bundles/org.eclipse.capra.ui/src/org/eclipse/capra/ui/handlers/selection/RemoveSelectionHandler.java b/bundles/org.eclipse.capra.ui/src/org/eclipse/capra/ui/handlers/selection/RemoveSelectionHandler.java
index e2974af..d2641cf 100644
--- a/bundles/org.eclipse.capra.ui/src/org/eclipse/capra/ui/handlers/selection/RemoveSelectionHandler.java
+++ b/bundles/org.eclipse.capra.ui/src/org/eclipse/capra/ui/handlers/selection/RemoveSelectionHandler.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *  
- *   Contributors:
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
  *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.ui.handlers.selection;
 
diff --git a/bundles/org.eclipse.capra.ui/src/org/eclipse/capra/ui/helpers/TraceCreationHelper.java b/bundles/org.eclipse.capra.ui/src/org/eclipse/capra/ui/helpers/TraceCreationHelper.java
index 6f7cdc7..b601060 100644
--- a/bundles/org.eclipse.capra.ui/src/org/eclipse/capra/ui/helpers/TraceCreationHelper.java
+++ b/bundles/org.eclipse.capra.ui/src/org/eclipse/capra/ui/helpers/TraceCreationHelper.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *  
- *   Contributors:
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
  *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.ui.helpers;
 
diff --git a/bundles/org.eclipse.capra.ui/src/org/eclipse/capra/ui/perspective/CapraPerspective.java b/bundles/org.eclipse.capra.ui/src/org/eclipse/capra/ui/perspective/CapraPerspective.java
index 34e691d..2ca8377 100644
--- a/bundles/org.eclipse.capra.ui/src/org/eclipse/capra/ui/perspective/CapraPerspective.java
+++ b/bundles/org.eclipse.capra.ui/src/org/eclipse/capra/ui/perspective/CapraPerspective.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *  
- *   Contributors:
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
  *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.ui.perspective;
 
diff --git a/bundles/org.eclipse.capra.ui/src/org/eclipse/capra/ui/preferences/CapraPreferences.java b/bundles/org.eclipse.capra.ui/src/org/eclipse/capra/ui/preferences/CapraPreferences.java
index 326054c..7df3e4b 100644
--- a/bundles/org.eclipse.capra.ui/src/org/eclipse/capra/ui/preferences/CapraPreferences.java
+++ b/bundles/org.eclipse.capra.ui/src/org/eclipse/capra/ui/preferences/CapraPreferences.java
@@ -1,3 +1,16 @@
+/*******************************************************************************
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v20.html
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
+ *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
+ *******************************************************************************/
 package org.eclipse.capra.ui.preferences;
 
 import org.eclipse.jface.preference.FieldEditorPreferencePage;
diff --git a/bundles/org.eclipse.capra.ui/src/org/eclipse/capra/ui/views/SelectionView.java b/bundles/org.eclipse.capra.ui/src/org/eclipse/capra/ui/views/SelectionView.java
index 42f60a3..d01c427 100644
--- a/bundles/org.eclipse.capra.ui/src/org/eclipse/capra/ui/views/SelectionView.java
+++ b/bundles/org.eclipse.capra.ui/src/org/eclipse/capra/ui/views/SelectionView.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- *   Contributors:
+ * http://www.eclipse.org/legal/epl-v20.html
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
  *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.ui.views;
 
diff --git a/features/org.eclipse.capra.core.feature/build.properties b/features/org.eclipse.capra.core.feature/build.properties
index 15e546a..faa416e 100644
--- a/features/org.eclipse.capra.core.feature/build.properties
+++ b/features/org.eclipse.capra.core.feature/build.properties
@@ -1,12 +1,15 @@
 ###############################################################################
-# Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+# Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #  
-#   Contributors:
+# SPDX-License-Identifier: EPL-2.0
+#  
+# Contributors:
 #      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+#      Chalmers | University of Gothenburg - additional features, updated API
 ###############################################################################
 bin.includes = feature.xml,\
                license.html,\
diff --git a/features/org.eclipse.capra.core.feature/feature.properties b/features/org.eclipse.capra.core.feature/feature.properties
index 3d012c2..bfe89b8 100644
--- a/features/org.eclipse.capra.core.feature/feature.properties
+++ b/features/org.eclipse.capra.core.feature/feature.properties
@@ -1,3 +1,16 @@
+###############################################################################
+# Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v2.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v20.html
+#  
+# SPDX-License-Identifier: EPL-2.0
+#  
+# Contributors:
+#      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+#      Chalmers | University of Gothenburg - additional features, updated API
+###############################################################################
 # "featureName" property - name of the feature
 featureName=Eclipse Capra Core Functionality
 
diff --git a/features/org.eclipse.capra.core.feature/pom.xml b/features/org.eclipse.capra.core.feature/pom.xml
index d67ca0f..e2fbdda 100644
--- a/features/org.eclipse.capra.core.feature/pom.xml
+++ b/features/org.eclipse.capra.core.feature/pom.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License v2.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v20.html
+     
+    SPDX-License-Identifier: EPL-2.0
+     
+    Contributors:
+         Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+         Chalmers | University of Gothenburg - additional features, updated API
+ -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
diff --git a/features/org.eclipse.capra.feature/build.properties b/features/org.eclipse.capra.feature/build.properties
index 15e546a..faa416e 100644
--- a/features/org.eclipse.capra.feature/build.properties
+++ b/features/org.eclipse.capra.feature/build.properties
@@ -1,12 +1,15 @@
 ###############################################################################
-# Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+# Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #  
-#   Contributors:
+# SPDX-License-Identifier: EPL-2.0
+#  
+# Contributors:
 #      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+#      Chalmers | University of Gothenburg - additional features, updated API
 ###############################################################################
 bin.includes = feature.xml,\
                license.html,\
diff --git a/features/org.eclipse.capra.feature/feature.properties b/features/org.eclipse.capra.feature/feature.properties
index 0cf487a..37d6e15 100644
--- a/features/org.eclipse.capra.feature/feature.properties
+++ b/features/org.eclipse.capra.feature/feature.properties
@@ -1,3 +1,16 @@
+###############################################################################
+# Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v2.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v20.html
+#  
+# SPDX-License-Identifier: EPL-2.0
+#  
+# Contributors:
+#      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+#      Chalmers | University of Gothenburg - additional features, updated API
+###############################################################################
 # "featureName" property - name of the feature
 featureName=Eclipse Capra (required)
 
diff --git a/features/org.eclipse.capra.feature/pom.xml b/features/org.eclipse.capra.feature/pom.xml
index 3661cdd..c327c73 100644
--- a/features/org.eclipse.capra.feature/pom.xml
+++ b/features/org.eclipse.capra.feature/pom.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License v2.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v20.html
+     
+    SPDX-License-Identifier: EPL-2.0
+     
+    Contributors:
+         Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+         Chalmers | University of Gothenburg - additional features, updated API
+ -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
diff --git a/features/org.eclipse.capra.generic.feature/build.properties b/features/org.eclipse.capra.generic.feature/build.properties
index 15e546a..faa416e 100644
--- a/features/org.eclipse.capra.generic.feature/build.properties
+++ b/features/org.eclipse.capra.generic.feature/build.properties
@@ -1,12 +1,15 @@
 ###############################################################################
-# Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+# Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #  
-#   Contributors:
+# SPDX-License-Identifier: EPL-2.0
+#  
+# Contributors:
 #      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+#      Chalmers | University of Gothenburg - additional features, updated API
 ###############################################################################
 bin.includes = feature.xml,\
                license.html,\
diff --git a/features/org.eclipse.capra.generic.feature/feature.properties b/features/org.eclipse.capra.generic.feature/feature.properties
index 13bcc23..df5c728 100644
--- a/features/org.eclipse.capra.generic.feature/feature.properties
+++ b/features/org.eclipse.capra.generic.feature/feature.properties
@@ -1,3 +1,17 @@
+###############################################################################
+# Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v2.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v20.html
+#  
+# SPDX-License-Identifier: EPL-2.0
+#  
+# Contributors:
+#      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+#      Chalmers | University of Gothenburg - additional features, updated API
+###############################################################################
+
 # "featureName" property - name of the feature
 featureName=Eclipse Capra Generic Models and Handlers
 
diff --git a/features/org.eclipse.capra.generic.feature/pom.xml b/features/org.eclipse.capra.generic.feature/pom.xml
index 3a4b374..a6cf5f7 100644
--- a/features/org.eclipse.capra.generic.feature/pom.xml
+++ b/features/org.eclipse.capra.generic.feature/pom.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License v2.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v20.html
+     
+    SPDX-License-Identifier: EPL-2.0
+     
+    Contributors:
+         Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+         Chalmers | University of Gothenburg - additional features, updated API
+ -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
diff --git a/features/org.eclipse.capra.handler.cdt.feature/build.properties b/features/org.eclipse.capra.handler.cdt.feature/build.properties
index 15e546a..faa416e 100644
--- a/features/org.eclipse.capra.handler.cdt.feature/build.properties
+++ b/features/org.eclipse.capra.handler.cdt.feature/build.properties
@@ -1,12 +1,15 @@
 ###############################################################################
-# Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+# Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #  
-#   Contributors:
+# SPDX-License-Identifier: EPL-2.0
+#  
+# Contributors:
 #      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+#      Chalmers | University of Gothenburg - additional features, updated API
 ###############################################################################
 bin.includes = feature.xml,\
                license.html,\
diff --git a/features/org.eclipse.capra.handler.cdt.feature/feature.properties b/features/org.eclipse.capra.handler.cdt.feature/feature.properties
index 439e0ca..ee46cc8 100644
--- a/features/org.eclipse.capra.handler.cdt.feature/feature.properties
+++ b/features/org.eclipse.capra.handler.cdt.feature/feature.properties
@@ -1,3 +1,17 @@
+###############################################################################
+# Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v2.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v20.html
+#  
+# SPDX-License-Identifier: EPL-2.0
+#  
+# Contributors:
+#      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+#      Chalmers | University of Gothenburg - additional features, updated API
+###############################################################################
+
 # "featureName" property - name of the feature
 featureName=Eclipse Capra Traceability for C/C++
 
diff --git a/features/org.eclipse.capra.handler.cdt.feature/pom.xml b/features/org.eclipse.capra.handler.cdt.feature/pom.xml
index 07db155..fddbc59 100644
--- a/features/org.eclipse.capra.handler.cdt.feature/pom.xml
+++ b/features/org.eclipse.capra.handler.cdt.feature/pom.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License v2.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v20.html
+     
+    SPDX-License-Identifier: EPL-2.0
+     
+    Contributors:
+         Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+         Chalmers | University of Gothenburg - additional features, updated API
+ -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
diff --git a/features/org.eclipse.capra.handler.featureide.feature/build.properties b/features/org.eclipse.capra.handler.featureide.feature/build.properties
index 15e546a..faa416e 100644
--- a/features/org.eclipse.capra.handler.featureide.feature/build.properties
+++ b/features/org.eclipse.capra.handler.featureide.feature/build.properties
@@ -1,12 +1,15 @@
 ###############################################################################
-# Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+# Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #  
-#   Contributors:
+# SPDX-License-Identifier: EPL-2.0
+#  
+# Contributors:
 #      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+#      Chalmers | University of Gothenburg - additional features, updated API
 ###############################################################################
 bin.includes = feature.xml,\
                license.html,\
diff --git a/features/org.eclipse.capra.handler.featureide.feature/feature.properties b/features/org.eclipse.capra.handler.featureide.feature/feature.properties
index af05964..e467c22 100644
--- a/features/org.eclipse.capra.handler.featureide.feature/feature.properties
+++ b/features/org.eclipse.capra.handler.featureide.feature/feature.properties
@@ -1,3 +1,17 @@
+###############################################################################
+# Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v2.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v20.html
+#  
+# SPDX-License-Identifier: EPL-2.0
+#  
+# Contributors:
+#      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+#      Chalmers | University of Gothenburg - additional features, updated API
+###############################################################################
+
 # "featureName" property - name of the feature
 featureName=Eclipse Capra Traceability for FeatureIDE
 
diff --git a/features/org.eclipse.capra.handler.featureide.feature/pom.xml b/features/org.eclipse.capra.handler.featureide.feature/pom.xml
index af688b0..49baa34 100644
--- a/features/org.eclipse.capra.handler.featureide.feature/pom.xml
+++ b/features/org.eclipse.capra.handler.featureide.feature/pom.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License v2.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v20.html
+     
+    SPDX-License-Identifier: EPL-2.0
+     
+    Contributors:
+         Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+         Chalmers | University of Gothenburg - additional features, updated API
+ -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
diff --git a/features/org.eclipse.capra.handler.hudson.feature/build.properties b/features/org.eclipse.capra.handler.hudson.feature/build.properties
index 15e546a..faa416e 100644
--- a/features/org.eclipse.capra.handler.hudson.feature/build.properties
+++ b/features/org.eclipse.capra.handler.hudson.feature/build.properties
@@ -1,12 +1,15 @@
 ###############################################################################
-# Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+# Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #  
-#   Contributors:
+# SPDX-License-Identifier: EPL-2.0
+#  
+# Contributors:
 #      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+#      Chalmers | University of Gothenburg - additional features, updated API
 ###############################################################################
 bin.includes = feature.xml,\
                license.html,\
diff --git a/features/org.eclipse.capra.handler.hudson.feature/feature.properties b/features/org.eclipse.capra.handler.hudson.feature/feature.properties
index 7b3a553..f495505 100644
--- a/features/org.eclipse.capra.handler.hudson.feature/feature.properties
+++ b/features/org.eclipse.capra.handler.hudson.feature/feature.properties
@@ -1,3 +1,16 @@
+###############################################################################
+# Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v2.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v20.html
+#  
+# SPDX-License-Identifier: EPL-2.0
+#  
+# Contributors:
+#      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+#      Chalmers | University of Gothenburg - additional features, updated API
+###############################################################################
 # "featureName" property - name of the feature
 featureName=Eclipse Capra Traceability for Hudson/Jenkins
 
diff --git a/features/org.eclipse.capra.handler.hudson.feature/pom.xml b/features/org.eclipse.capra.handler.hudson.feature/pom.xml
index b044449..1aeebf0 100644
--- a/features/org.eclipse.capra.handler.hudson.feature/pom.xml
+++ b/features/org.eclipse.capra.handler.hudson.feature/pom.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License v2.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v20.html
+     
+    SPDX-License-Identifier: EPL-2.0
+     
+    Contributors:
+         Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+         Chalmers | University of Gothenburg - additional features, updated API
+ -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
diff --git a/features/org.eclipse.capra.handler.jdt.feature/build.properties b/features/org.eclipse.capra.handler.jdt.feature/build.properties
index 15e546a..faa416e 100644
--- a/features/org.eclipse.capra.handler.jdt.feature/build.properties
+++ b/features/org.eclipse.capra.handler.jdt.feature/build.properties
@@ -1,12 +1,15 @@
 ###############################################################################
-# Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+# Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #  
-#   Contributors:
+# SPDX-License-Identifier: EPL-2.0
+#  
+# Contributors:
 #      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+#      Chalmers | University of Gothenburg - additional features, updated API
 ###############################################################################
 bin.includes = feature.xml,\
                license.html,\
diff --git a/features/org.eclipse.capra.handler.jdt.feature/feature.properties b/features/org.eclipse.capra.handler.jdt.feature/feature.properties
index d83b5c8..c6c5e4b 100644
--- a/features/org.eclipse.capra.handler.jdt.feature/feature.properties
+++ b/features/org.eclipse.capra.handler.jdt.feature/feature.properties
@@ -1,3 +1,16 @@
+###############################################################################
+# Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v2.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v20.html
+#  
+# SPDX-License-Identifier: EPL-2.0
+#  
+# Contributors:
+#      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+#      Chalmers | University of Gothenburg - additional features, updated API
+###############################################################################
 # "featureName" property - name of the feature
 featureName=Eclipse Capra Traceability for Java
 
diff --git a/features/org.eclipse.capra.handler.jdt.feature/pom.xml b/features/org.eclipse.capra.handler.jdt.feature/pom.xml
index 13ac763..d268217 100644
--- a/features/org.eclipse.capra.handler.jdt.feature/pom.xml
+++ b/features/org.eclipse.capra.handler.jdt.feature/pom.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License v2.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v20.html
+     
+    SPDX-License-Identifier: EPL-2.0
+     
+    Contributors:
+         Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+         Chalmers | University of Gothenburg - additional features, updated API
+ -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
diff --git a/features/org.eclipse.capra.handler.office.feature/build.properties b/features/org.eclipse.capra.handler.office.feature/build.properties
index 15e546a..faa416e 100644
--- a/features/org.eclipse.capra.handler.office.feature/build.properties
+++ b/features/org.eclipse.capra.handler.office.feature/build.properties
@@ -1,12 +1,15 @@
 ###############################################################################
-# Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+# Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #  
-#   Contributors:
+# SPDX-License-Identifier: EPL-2.0
+#  
+# Contributors:
 #      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+#      Chalmers | University of Gothenburg - additional features, updated API
 ###############################################################################
 bin.includes = feature.xml,\
                license.html,\
diff --git a/features/org.eclipse.capra.handler.office.feature/feature.properties b/features/org.eclipse.capra.handler.office.feature/feature.properties
index d9c28c3..73a1401 100644
--- a/features/org.eclipse.capra.handler.office.feature/feature.properties
+++ b/features/org.eclipse.capra.handler.office.feature/feature.properties
@@ -1,3 +1,16 @@
+###############################################################################
+# Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v2.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v20.html
+#  
+# SPDX-License-Identifier: EPL-2.0
+#  
+# Contributors:
+#      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+#      Chalmers | University of Gothenburg - additional features, updated API
+###############################################################################
 # "featureName" property - name of the feature
 featureName=Eclipse Capra Traceability for Microsoft Office Documents and Google Sheets
 
diff --git a/features/org.eclipse.capra.handler.office.feature/pom.xml b/features/org.eclipse.capra.handler.office.feature/pom.xml
index 3cc6b46..1a76819 100644
--- a/features/org.eclipse.capra.handler.office.feature/pom.xml
+++ b/features/org.eclipse.capra.handler.office.feature/pom.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License v2.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v20.html
+     
+    SPDX-License-Identifier: EPL-2.0
+     
+    Contributors:
+         Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+         Chalmers | University of Gothenburg - additional features, updated API
+ -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
diff --git a/features/org.eclipse.capra.handler.papyrus.feature/build.properties b/features/org.eclipse.capra.handler.papyrus.feature/build.properties
index 15e546a..faa416e 100644
--- a/features/org.eclipse.capra.handler.papyrus.feature/build.properties
+++ b/features/org.eclipse.capra.handler.papyrus.feature/build.properties
@@ -1,12 +1,15 @@
 ###############################################################################
-# Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+# Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #  
-#   Contributors:
+# SPDX-License-Identifier: EPL-2.0
+#  
+# Contributors:
 #      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+#      Chalmers | University of Gothenburg - additional features, updated API
 ###############################################################################
 bin.includes = feature.xml,\
                license.html,\
diff --git a/features/org.eclipse.capra.handler.papyrus.feature/feature.properties b/features/org.eclipse.capra.handler.papyrus.feature/feature.properties
index db885bc..688ec8a 100644
--- a/features/org.eclipse.capra.handler.papyrus.feature/feature.properties
+++ b/features/org.eclipse.capra.handler.papyrus.feature/feature.properties
@@ -1,3 +1,16 @@
+###############################################################################
+# Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v2.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v20.html
+#  
+# SPDX-License-Identifier: EPL-2.0
+#  
+# Contributors:
+#      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+#      Chalmers | University of Gothenburg - additional features, updated API
+###############################################################################
 # "featureName" property - name of the feature
 featureName=Eclipse Capra Traceability for Papyrus
 
diff --git a/features/org.eclipse.capra.handler.papyrus.feature/pom.xml b/features/org.eclipse.capra.handler.papyrus.feature/pom.xml
index d387f78..b3b9d61 100644
--- a/features/org.eclipse.capra.handler.papyrus.feature/pom.xml
+++ b/features/org.eclipse.capra.handler.papyrus.feature/pom.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License v2.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v20.html
+     
+    SPDX-License-Identifier: EPL-2.0
+     
+    Contributors:
+         Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+         Chalmers | University of Gothenburg - additional features, updated API
+ -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
diff --git a/features/org.eclipse.capra.handler.php.feature/build.properties b/features/org.eclipse.capra.handler.php.feature/build.properties
index 15e546a..faa416e 100644
--- a/features/org.eclipse.capra.handler.php.feature/build.properties
+++ b/features/org.eclipse.capra.handler.php.feature/build.properties
@@ -1,12 +1,15 @@
 ###############################################################################
-# Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+# Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #  
-#   Contributors:
+# SPDX-License-Identifier: EPL-2.0
+#  
+# Contributors:
 #      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+#      Chalmers | University of Gothenburg - additional features, updated API
 ###############################################################################
 bin.includes = feature.xml,\
                license.html,\
diff --git a/features/org.eclipse.capra.handler.php.feature/feature.properties b/features/org.eclipse.capra.handler.php.feature/feature.properties
index 9ff6c55..bcd5151 100644
--- a/features/org.eclipse.capra.handler.php.feature/feature.properties
+++ b/features/org.eclipse.capra.handler.php.feature/feature.properties
@@ -1,3 +1,16 @@
+###############################################################################
+# Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v2.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v20.html
+#  
+# SPDX-License-Identifier: EPL-2.0
+#  
+# Contributors:
+#      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+#      Chalmers | University of Gothenburg - additional features, updated API
+###############################################################################
 # "featureName" property - name of the feature
 featureName=Eclipse Capra Traceability for PHP
 
diff --git a/features/org.eclipse.capra.handler.php.feature/pom.xml b/features/org.eclipse.capra.handler.php.feature/pom.xml
index 104a919..78a0259 100644
--- a/features/org.eclipse.capra.handler.php.feature/pom.xml
+++ b/features/org.eclipse.capra.handler.php.feature/pom.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License v2.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v20.html
+     
+    SPDX-License-Identifier: EPL-2.0
+     
+    Contributors:
+         Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+         Chalmers | University of Gothenburg - additional features, updated API
+ -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
diff --git a/features/org.eclipse.capra.handler.reqIf.feature/build.properties b/features/org.eclipse.capra.handler.reqIf.feature/build.properties
index 15e546a..faa416e 100644
--- a/features/org.eclipse.capra.handler.reqIf.feature/build.properties
+++ b/features/org.eclipse.capra.handler.reqIf.feature/build.properties
@@ -1,12 +1,15 @@
 ###############################################################################
-# Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+# Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #  
-#   Contributors:
+# SPDX-License-Identifier: EPL-2.0
+#  
+# Contributors:
 #      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+#      Chalmers | University of Gothenburg - additional features, updated API
 ###############################################################################
 bin.includes = feature.xml,\
                license.html,\
diff --git a/features/org.eclipse.capra.handler.reqIf.feature/feature.properties b/features/org.eclipse.capra.handler.reqIf.feature/feature.properties
index 3340b94..4dfcaea 100644
--- a/features/org.eclipse.capra.handler.reqIf.feature/feature.properties
+++ b/features/org.eclipse.capra.handler.reqIf.feature/feature.properties
@@ -1,3 +1,16 @@
+###############################################################################
+# Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v2.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v20.html
+#  
+# SPDX-License-Identifier: EPL-2.0
+#  
+# Contributors:
+#      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+#      Chalmers | University of Gothenburg - additional features, updated API
+###############################################################################
 # "featureName" property - name of the feature
 featureName=Eclipse Capra Traceability for ReqIF
 
diff --git a/features/org.eclipse.capra.handler.reqIf.feature/pom.xml b/features/org.eclipse.capra.handler.reqIf.feature/pom.xml
index 7a4a699..d709dd1 100644
--- a/features/org.eclipse.capra.handler.reqIf.feature/pom.xml
+++ b/features/org.eclipse.capra.handler.reqIf.feature/pom.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License v2.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v20.html
+     
+    SPDX-License-Identifier: EPL-2.0
+     
+    Contributors:
+         Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+         Chalmers | University of Gothenburg - additional features, updated API
+ -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
diff --git a/features/org.eclipse.capra.ui.feature/build.properties b/features/org.eclipse.capra.ui.feature/build.properties
index 15e546a..faa416e 100644
--- a/features/org.eclipse.capra.ui.feature/build.properties
+++ b/features/org.eclipse.capra.ui.feature/build.properties
@@ -1,12 +1,15 @@
 ###############################################################################
-# Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+# Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #  
-#   Contributors:
+# SPDX-License-Identifier: EPL-2.0
+#  
+# Contributors:
 #      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+#      Chalmers | University of Gothenburg - additional features, updated API
 ###############################################################################
 bin.includes = feature.xml,\
                license.html,\
diff --git a/features/org.eclipse.capra.ui.feature/feature.properties b/features/org.eclipse.capra.ui.feature/feature.properties
index a40e77c..b2c1e88 100644
--- a/features/org.eclipse.capra.ui.feature/feature.properties
+++ b/features/org.eclipse.capra.ui.feature/feature.properties
@@ -1,3 +1,16 @@
+###############################################################################
+# Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v2.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v20.html
+#  
+# SPDX-License-Identifier: EPL-2.0
+#  
+# Contributors:
+#      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+#      Chalmers | University of Gothenburg - additional features, updated API
+###############################################################################
 # "featureName" property - name of the feature
 featureName=Eclipse Capra User Interface Support
 
diff --git a/features/org.eclipse.capra.ui.feature/pom.xml b/features/org.eclipse.capra.ui.feature/pom.xml
index d7ea2e2..0cb1939 100644
--- a/features/org.eclipse.capra.ui.feature/pom.xml
+++ b/features/org.eclipse.capra.ui.feature/pom.xml
@@ -1,4 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License v2.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v20.html
+     
+    SPDX-License-Identifier: EPL-2.0
+     
+    Contributors:
+         Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+         Chalmers | University of Gothenburg - additional features, updated API
+ -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
diff --git a/features/org.eclipse.capra.ui.plantuml.feature/build.properties b/features/org.eclipse.capra.ui.plantuml.feature/build.properties
index 15e546a..faa416e 100644
--- a/features/org.eclipse.capra.ui.plantuml.feature/build.properties
+++ b/features/org.eclipse.capra.ui.plantuml.feature/build.properties
@@ -1,12 +1,15 @@
 ###############################################################################
-# Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+# Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #  
-#   Contributors:
+# SPDX-License-Identifier: EPL-2.0
+#  
+# Contributors:
 #      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+#      Chalmers | University of Gothenburg - additional features, updated API
 ###############################################################################
 bin.includes = feature.xml,\
                license.html,\
diff --git a/features/org.eclipse.capra.ui.plantuml.feature/feature.properties b/features/org.eclipse.capra.ui.plantuml.feature/feature.properties
index 952a900..a1286ad 100644
--- a/features/org.eclipse.capra.ui.plantuml.feature/feature.properties
+++ b/features/org.eclipse.capra.ui.plantuml.feature/feature.properties
@@ -1,3 +1,16 @@
+###############################################################################
+# Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v2.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v20.html
+#  
+# SPDX-License-Identifier: EPL-2.0
+#  
+# Contributors:
+#      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+#      Chalmers | University of Gothenburg - additional features, updated API
+###############################################################################
 # "featureName" property - name of the feature
 featureName=Eclipse Capra Traceability Visualisation with PlantUML
 
diff --git a/features/org.eclipse.capra.ui.plantuml.feature/pom.xml b/features/org.eclipse.capra.ui.plantuml.feature/pom.xml
index c253c48..1e4c3f6 100644
--- a/features/org.eclipse.capra.ui.plantuml.feature/pom.xml
+++ b/features/org.eclipse.capra.ui.plantuml.feature/pom.xml
@@ -1,4 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License v2.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v20.html
+     
+    SPDX-License-Identifier: EPL-2.0
+     
+    Contributors:
+         Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+         Chalmers | University of Gothenburg - additional features, updated API
+ -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
diff --git a/features/org.eclipse.capra.ui.zest.feature/build.properties b/features/org.eclipse.capra.ui.zest.feature/build.properties
index 15e546a..faa416e 100644
--- a/features/org.eclipse.capra.ui.zest.feature/build.properties
+++ b/features/org.eclipse.capra.ui.zest.feature/build.properties
@@ -1,12 +1,15 @@
 ###############################################################################
-# Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+# Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# http://www.eclipse.org/legal/epl-v20.html
 #  
-#   Contributors:
+# SPDX-License-Identifier: EPL-2.0
+#  
+# Contributors:
 #      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+#      Chalmers | University of Gothenburg - additional features, updated API
 ###############################################################################
 bin.includes = feature.xml,\
                license.html,\
diff --git a/features/org.eclipse.capra.ui.zest.feature/feature.properties b/features/org.eclipse.capra.ui.zest.feature/feature.properties
index ddc3d84..bf7eac0 100644
--- a/features/org.eclipse.capra.ui.zest.feature/feature.properties
+++ b/features/org.eclipse.capra.ui.zest.feature/feature.properties
@@ -1,3 +1,16 @@
+###############################################################################
+# Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v2.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v20.html
+#  
+# SPDX-License-Identifier: EPL-2.0
+#  
+# Contributors:
+#      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+#      Chalmers | University of Gothenburg - additional features, updated API
+###############################################################################
 # "featureName" property - name of the feature
 featureName=Eclipse Capra Traceability Visualisation with Eclipse Zest
 
diff --git a/features/org.eclipse.capra.ui.zest.feature/pom.xml b/features/org.eclipse.capra.ui.zest.feature/pom.xml
index 7a9e00e..19a3c79 100644
--- a/features/org.eclipse.capra.ui.zest.feature/pom.xml
+++ b/features/org.eclipse.capra.ui.zest.feature/pom.xml
@@ -1,4 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License v2.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v20.html
+     
+    SPDX-License-Identifier: EPL-2.0
+     
+    Contributors:
+         Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+         Chalmers | University of Gothenburg - additional features, updated API
+ -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
diff --git a/releng/org.eclipse.capra.releng.p2/pom.xml b/releng/org.eclipse.capra.releng.p2/pom.xml
index 3f52f62..6a57640 100644
--- a/releng/org.eclipse.capra.releng.p2/pom.xml
+++ b/releng/org.eclipse.capra.releng.p2/pom.xml
@@ -1,4 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License v2.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v20.html
+     
+    SPDX-License-Identifier: EPL-2.0
+     
+    Contributors:
+         Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+         Chalmers | University of Gothenburg - additional features, updated API
+ -->
+
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
          xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
diff --git a/releng/org.eclipse.capra.releng.target/pom.xml b/releng/org.eclipse.capra.releng.target/pom.xml
index 606bf67..d947e48 100644
--- a/releng/org.eclipse.capra.releng.target/pom.xml
+++ b/releng/org.eclipse.capra.releng.target/pom.xml
@@ -1,4 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License v2.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v20.html
+     
+    SPDX-License-Identifier: EPL-2.0
+     
+    Contributors:
+         Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+         Chalmers | University of Gothenburg - additional features, updated API
+ -->
+
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
diff --git a/tests/org.eclipse.capra.handler.cdt.tests/build.properties b/tests/org.eclipse.capra.handler.cdt.tests/build.properties
index 8553473..d75096d 100644
--- a/tests/org.eclipse.capra.handler.cdt.tests/build.properties
+++ b/tests/org.eclipse.capra.handler.cdt.tests/build.properties
@@ -1,12 +1,15 @@
 ###############################################################################
-# Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+# Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-#   Contributors:
+# http://www.eclipse.org/legal/epl-v20.html
+#  
+# SPDX-License-Identifier: EPL-2.0
+#  
+# Contributors:
 #      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+#      Chalmers | University of Gothenburg - additional features, updated API
 ###############################################################################
 source.. = src/
 output.. = bin/
diff --git a/tests/org.eclipse.capra.handler.cdt.tests/pom.xml b/tests/org.eclipse.capra.handler.cdt.tests/pom.xml
index 5a9e610..6bab506 100644
--- a/tests/org.eclipse.capra.handler.cdt.tests/pom.xml
+++ b/tests/org.eclipse.capra.handler.cdt.tests/pom.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+    Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
     All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
+    are made available under the terms of the Eclipse Public License v2.0
     which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
-
-      Contributors:
+    http://www.eclipse.org/legal/epl-v20.html
+     
+    SPDX-License-Identifier: EPL-2.0
+     
+    Contributors:
          Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+         Chalmers | University of Gothenburg - additional features, updated API
  -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/tests/org.eclipse.capra.handler.cdt.tests/src/org/eclipse/capra/handler/cdt/CDTAnnotateTest.java b/tests/org.eclipse.capra.handler.cdt.tests/src/org/eclipse/capra/handler/cdt/CDTAnnotateTest.java
index e092c14..0fcfdce 100644
--- a/tests/org.eclipse.capra.handler.cdt.tests/src/org/eclipse/capra/handler/cdt/CDTAnnotateTest.java
+++ b/tests/org.eclipse.capra.handler.cdt.tests/src/org/eclipse/capra/handler/cdt/CDTAnnotateTest.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- *   Contributors:
+ * http://www.eclipse.org/legal/epl-v20.html
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
  *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.handler.cdt;
 
diff --git a/tests/org.eclipse.capra.handler.cdt.tests/src/org/eclipse/capra/handler/cdt/CDTCommentUpdateTest.java b/tests/org.eclipse.capra.handler.cdt.tests/src/org/eclipse/capra/handler/cdt/CDTCommentUpdateTest.java
index f4297ed..4796acd 100644
--- a/tests/org.eclipse.capra.handler.cdt.tests/src/org/eclipse/capra/handler/cdt/CDTCommentUpdateTest.java
+++ b/tests/org.eclipse.capra.handler.cdt.tests/src/org/eclipse/capra/handler/cdt/CDTCommentUpdateTest.java
@@ -1,3 +1,16 @@
+/*******************************************************************************
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v20.html
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
+ *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
+ *******************************************************************************/
 package org.eclipse.capra.handler.cdt;
 
 import static org.junit.Assert.assertEquals;
diff --git a/tests/org.eclipse.capra.handler.cdt.tests/src/org/eclipse/capra/handler/cdt/TestUtil.java b/tests/org.eclipse.capra.handler.cdt.tests/src/org/eclipse/capra/handler/cdt/TestUtil.java
index 10f037b..c2d46de 100644
--- a/tests/org.eclipse.capra.handler.cdt.tests/src/org/eclipse/capra/handler/cdt/TestUtil.java
+++ b/tests/org.eclipse.capra.handler.cdt.tests/src/org/eclipse/capra/handler/cdt/TestUtil.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- *   Contributors:
+ * http://www.eclipse.org/legal/epl-v20.html
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
  *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.handler.cdt;
 
diff --git a/tests/org.eclipse.capra.handler.jdt.tests/build.properties b/tests/org.eclipse.capra.handler.jdt.tests/build.properties
index 8553473..d75096d 100644
--- a/tests/org.eclipse.capra.handler.jdt.tests/build.properties
+++ b/tests/org.eclipse.capra.handler.jdt.tests/build.properties
@@ -1,12 +1,15 @@
 ###############################################################################
-# Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+# Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-#   Contributors:
+# http://www.eclipse.org/legal/epl-v20.html
+#  
+# SPDX-License-Identifier: EPL-2.0
+#  
+# Contributors:
 #      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+#      Chalmers | University of Gothenburg - additional features, updated API
 ###############################################################################
 source.. = src/
 output.. = bin/
diff --git a/tests/org.eclipse.capra.handler.jdt.tests/pom.xml b/tests/org.eclipse.capra.handler.jdt.tests/pom.xml
index 6b50844..537333a 100644
--- a/tests/org.eclipse.capra.handler.jdt.tests/pom.xml
+++ b/tests/org.eclipse.capra.handler.jdt.tests/pom.xml
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-	Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
-	All rights reserved. This program and the accompanying materials
-	are made available under the terms of the Eclipse Public License v1.0
-	which accompanies this distribution, and is available at
-	http://www.eclipse.org/legal/epl-v10.html
-
-	Contributors:
-		Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
--->
+    Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License v2.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v20.html
+     
+    SPDX-License-Identifier: EPL-2.0
+     
+    Contributors:
+         Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+         Chalmers | University of Gothenburg - additional features, updated API
+ -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/tests/org.eclipse.capra.handler.jdt.tests/src/org/eclipse/capra/handler/jdt/JDTAnnotateTest.java b/tests/org.eclipse.capra.handler.jdt.tests/src/org/eclipse/capra/handler/jdt/JDTAnnotateTest.java
index d317c15..ff40ae2 100644
--- a/tests/org.eclipse.capra.handler.jdt.tests/src/org/eclipse/capra/handler/jdt/JDTAnnotateTest.java
+++ b/tests/org.eclipse.capra.handler.jdt.tests/src/org/eclipse/capra/handler/jdt/JDTAnnotateTest.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- *   Contributors:
+ * http://www.eclipse.org/legal/epl-v20.html
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
  *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.handler.jdt;
 
diff --git a/tests/org.eclipse.capra.handler.jdt.tests/src/org/eclipse/capra/handler/jdt/TestUtil.java b/tests/org.eclipse.capra.handler.jdt.tests/src/org/eclipse/capra/handler/jdt/TestUtil.java
index db84fdc..625ebcb 100644
--- a/tests/org.eclipse.capra.handler.jdt.tests/src/org/eclipse/capra/handler/jdt/TestUtil.java
+++ b/tests/org.eclipse.capra.handler.jdt.tests/src/org/eclipse/capra/handler/jdt/TestUtil.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- *   Contributors:
+ * http://www.eclipse.org/legal/epl-v20.html
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
  *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.handler.jdt;
 
diff --git a/tests/org.eclipse.capra.testsuite/build.properties b/tests/org.eclipse.capra.testsuite/build.properties
index 69fddb3..50645f3 100644
--- a/tests/org.eclipse.capra.testsuite/build.properties
+++ b/tests/org.eclipse.capra.testsuite/build.properties
@@ -1,12 +1,15 @@
 ###############################################################################
-#  Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
-#  All rights reserved. This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License v1.0
-#  which accompanies this distribution, and is available at
-#  http://www.eclipse.org/legal/epl-v10.html
+# Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v2.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v20.html
 #  
-#   Contributors:
-#      Chalmers|Gothenburg University and rt-labs - initial API and implementation and/or initial documentation
+# SPDX-License-Identifier: EPL-2.0
+#  
+# Contributors:
+#      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+#      Chalmers | University of Gothenburg - additional features, updated API
 ###############################################################################
 source.. = src/
 bin.includes = META-INF/,\
diff --git a/tests/org.eclipse.capra.testsuite/plugin.xml b/tests/org.eclipse.capra.testsuite/plugin.xml
index 1589acc..aeaf4a8 100644
--- a/tests/org.eclipse.capra.testsuite/plugin.xml
+++ b/tests/org.eclipse.capra.testsuite/plugin.xml
@@ -1,5 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.4"?>
+<!--
+    Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License v2.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v20.html
+     
+    SPDX-License-Identifier: EPL-2.0
+     
+    Contributors:
+         Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+         Chalmers | University of Gothenburg - additional features, updated API
+ -->
+
 <plugin>
    <extension
          point="org.eclipse.capra.ui.transfers">
diff --git a/tests/org.eclipse.capra.testsuite/pom.xml b/tests/org.eclipse.capra.testsuite/pom.xml
index cc05d44..1648d0b 100644
--- a/tests/org.eclipse.capra.testsuite/pom.xml
+++ b/tests/org.eclipse.capra.testsuite/pom.xml
@@ -1,10 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and 
-	others. All rights reserved. This program and the accompanying materials 
-	are made available under the terms of the Eclipse Public License v1.0 which 
-	accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html 
-	Contributors: Chalmers | University of Gothenburg and rt-labs - initial API 
-	and implementation and/or initial documentation -->
+<!--
+    Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License v2.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v20.html
+     
+    SPDX-License-Identifier: EPL-2.0
+     
+    Contributors:
+         Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+         Chalmers | University of Gothenburg - additional features, updated API
+ -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/tests/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/TestCreateTrace.java b/tests/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/TestCreateTrace.java
index eaae6b5..55e57a3 100644
--- a/tests/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/TestCreateTrace.java
+++ b/tests/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/TestCreateTrace.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- *  Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v20.html
  *  
- *   Contributors:
- *      Chalmers|Gothenburg University and rt-labs - initial API and implementation and/or initial documentation
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
+ *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.testsuite;
 
diff --git a/tests/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/TestDefaultPriorityHandler.java b/tests/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/TestDefaultPriorityHandler.java
index ec47a8a..980a94b 100644
--- a/tests/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/TestDefaultPriorityHandler.java
+++ b/tests/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/TestDefaultPriorityHandler.java
@@ -1,3 +1,16 @@
+/*******************************************************************************
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v20.html
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
+ *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
+ *******************************************************************************/
 package org.eclipse.capra.testsuite;
 
 import java.util.ArrayList;
diff --git a/tests/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/TestGraphicalVisualization.java b/tests/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/TestGraphicalVisualization.java
index 2a27ef1..93e6568 100644
--- a/tests/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/TestGraphicalVisualization.java
+++ b/tests/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/TestGraphicalVisualization.java
@@ -1,3 +1,16 @@
+/*******************************************************************************
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v20.html
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
+ *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
+ *******************************************************************************/
 package org.eclipse.capra.testsuite;
 
 import static org.eclipse.capra.testsuite.TestHelper.clearWorkspace;
diff --git a/tests/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/TestHelper.java b/tests/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/TestHelper.java
index 020ed55..c68ca18 100644
--- a/tests/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/TestHelper.java
+++ b/tests/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/TestHelper.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- *  Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- *
- *   Contributors:
- *      Chalmers|Gothenburg University and rt-labs - initial API and implementation and/or initial documentation
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v20.html
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
+ *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.testsuite;
 
diff --git a/tests/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/TestRetry.java b/tests/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/TestRetry.java
index 0d4080b..628c00d 100644
--- a/tests/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/TestRetry.java
+++ b/tests/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/TestRetry.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- *  Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v20.html
  *  
- *   Contributors:
- *      Chalmers|Gothenburg University and rt-labs - initial API and implementation and/or initial documentation
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
+ *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 
 package org.eclipse.capra.testsuite;
diff --git a/tests/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/TestTraceabiltyMatrix.java b/tests/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/TestTraceabiltyMatrix.java
index 4571fd7..903f252 100644
--- a/tests/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/TestTraceabiltyMatrix.java
+++ b/tests/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/TestTraceabiltyMatrix.java
@@ -1,3 +1,16 @@
+/*******************************************************************************
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v20.html
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
+ *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
+ *******************************************************************************/
 package org.eclipse.capra.testsuite;
 
 import static org.eclipse.capra.testsuite.TestHelper.clearWorkspace;
diff --git a/tests/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/TestUiExtensionPoint.java b/tests/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/TestUiExtensionPoint.java
index 31839ad..e682569 100644
--- a/tests/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/TestUiExtensionPoint.java
+++ b/tests/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/TestUiExtensionPoint.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v20.html
  *  
- *   Contributors:
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
  *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 package org.eclipse.capra.testsuite;
 
diff --git a/tests/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/extension/UiTransferExtensionDummy.java b/tests/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/extension/UiTransferExtensionDummy.java
index 82c5394..84b08dc 100644
--- a/tests/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/extension/UiTransferExtensionDummy.java
+++ b/tests/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/extension/UiTransferExtensionDummy.java
@@ -1,3 +1,16 @@
+/*******************************************************************************
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v20.html
+ *  
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
+ *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
+ *******************************************************************************/
 package org.eclipse.capra.testsuite.extension;
 
 import org.eclipse.swt.dnd.Transfer;
diff --git a/tests/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/notification/TestNotificationCMethod.java b/tests/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/notification/TestNotificationCMethod.java
index 8547ced..caa7b02 100644
--- a/tests/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/notification/TestNotificationCMethod.java
+++ b/tests/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/notification/TestNotificationCMethod.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- *  Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v20.html
  *  
- *   Contributors:
- *      Chalmers|Gothenburg University and rt-labs - initial API and implementation and/or initial documentation
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
+ *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 
 package org.eclipse.capra.testsuite.notification;
diff --git a/tests/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/notification/TestNotificationEObject.java b/tests/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/notification/TestNotificationEObject.java
index a4338a1..60d726a 100644
--- a/tests/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/notification/TestNotificationEObject.java
+++ b/tests/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/notification/TestNotificationEObject.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- *  Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v20.html
  *  
- *   Contributors:
- *      Chalmers|Gothenburg University and rt-labs - initial API and implementation and/or initial documentation
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
+ *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 
 package org.eclipse.capra.testsuite.notification;
diff --git a/tests/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/notification/TestNotificationFile.java b/tests/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/notification/TestNotificationFile.java
index 7204476..b7ecc7c 100644
--- a/tests/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/notification/TestNotificationFile.java
+++ b/tests/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/notification/TestNotificationFile.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- *  Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v20.html
  *  
- *   Contributors:
- *      Chalmers|Gothenburg University and rt-labs - initial API and implementation and/or initial documentation
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
+ *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 
 package org.eclipse.capra.testsuite.notification;
diff --git a/tests/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/notification/TestNotificationJavaMethod.java b/tests/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/notification/TestNotificationJavaMethod.java
index 12b0499..ac385f0 100644
--- a/tests/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/notification/TestNotificationJavaMethod.java
+++ b/tests/org.eclipse.capra.testsuite/src/org/eclipse/capra/testsuite/notification/TestNotificationJavaMethod.java
@@ -1,12 +1,15 @@
 /*******************************************************************************
- *  Copyright (c) 2016 Chalmers | University of Gothenburg, rt-labs and others.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
+ * Copyright (c) 2016, 2019 Chalmers | University of Gothenburg, rt-labs and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v20.html
  *  
- *   Contributors:
- *      Chalmers|Gothenburg University and rt-labs - initial API and implementation and/or initial documentation
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
+ *      Chalmers | University of Gothenburg and rt-labs - initial API and implementation and/or initial documentation
+ *      Chalmers | University of Gothenburg - additional features, updated API
  *******************************************************************************/
 
 package org.eclipse.capra.testsuite.notification;