diff --git a/EtsiServerGen/CMakeLists.txt b/EtsiServerGen/CMakeLists.txt
index 4df5eaec9dbed4d69895b6fe27ecf68fe6d1c02f..958369e8e30ae200c9008708bb4af02862e84d3e 100644
--- a/EtsiServerGen/CMakeLists.txt
+++ b/EtsiServerGen/CMakeLists.txt
@@ -1,3 +1,23 @@
+#
+# ARF - Augmented Reality Framework (ETSI ISG ARF)
+#
+# Copyright 2022 ETSI
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# Last change: June 2022
+#
+
 cmake_minimum_required (VERSION 3.2)
 
 project(PistacheGen)
diff --git a/EtsiServerImpl/CMakeLists.txt b/EtsiServerImpl/CMakeLists.txt
index 07686b3ff0eb3db45ad1d87fed6da4015af4f727..2d7f9b2a42d499ee1bd3151c7ff6890a6c59a1ef 100644
--- a/EtsiServerImpl/CMakeLists.txt
+++ b/EtsiServerImpl/CMakeLists.txt
@@ -1,3 +1,23 @@
+#
+# ARF - Augmented Reality Framework (ETSI ISG ARF)
+#
+# Copyright 2022 ETSI
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# Last change: June 2022
+#
+
 cmake_minimum_required(VERSION 3.2)
 project(HackPistacheServ VERSION 0.1.0)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -pg -g3" )
diff --git a/EtsiServerImpl/src/DefaultApiEtsi.cpp b/EtsiServerImpl/src/DefaultApiEtsi.cpp
index 2ddac9d436450e52b1320432cb3063c64f64ef29..a006ac67af299ccfb64c4289d1d35ffddcf3e268 100644
--- a/EtsiServerImpl/src/DefaultApiEtsi.cpp
+++ b/EtsiServerImpl/src/DefaultApiEtsi.cpp
@@ -1,3 +1,23 @@
+//
+// ARF - Augmented Reality Framework (ETSI ISG ARF)
+//
+// Copyright 2022 ETSI
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// Last change: June 2022
+//
+
 #include "DefaultApiEtsi.h"
 
 
diff --git a/EtsiServerImpl/src/DefaultApiEtsi.h b/EtsiServerImpl/src/DefaultApiEtsi.h
index cfdc4ae741f2bb9645de1d6133753f164aa4a8a4..a446ae2d9ffc6014eff2703497a11bb8efb0987c 100644
--- a/EtsiServerImpl/src/DefaultApiEtsi.h
+++ b/EtsiServerImpl/src/DefaultApiEtsi.h
@@ -1,3 +1,23 @@
+//
+// ARF - Augmented Reality Framework (ETSI ISG ARF)
+//
+// Copyright 2022 ETSI
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// Last change: June 2022
+//
+
 #ifndef DefaultApiEtsi_H_
 #define DefaultApiEtsi_H_
 
diff --git a/EtsiServerImpl/src/TrackableApiEtsi.cpp b/EtsiServerImpl/src/TrackableApiEtsi.cpp
index 6b85427a3e2f36529f6f235b4319ade36c56ca33..4c16167b1504eea1b8690973c913f0a417a25c62 100644
--- a/EtsiServerImpl/src/TrackableApiEtsi.cpp
+++ b/EtsiServerImpl/src/TrackableApiEtsi.cpp
@@ -1,3 +1,23 @@
+//
+// ARF - Augmented Reality Framework (ETSI ISG ARF)
+//
+// Copyright 2022 ETSI
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// Last change: June 2022
+//
+
 #include "TrackableApiEtsi.h"
 #include <boost/uuid/uuid.hpp>
 #include <boost/lexical_cast.hpp>
@@ -46,4 +66,4 @@ void TrackableApiEtsi::get_trackables(Pistache::Http::ResponseWriter &response)
     response.send(Pistache::Http::Code::Ok, jsonObjects.dump());
 }
 
-}
\ No newline at end of file
+}
diff --git a/EtsiServerImpl/src/TrackableApiEtsi.h b/EtsiServerImpl/src/TrackableApiEtsi.h
index b6f82199f9c6d09ff09035619f02682fd737897a..d09317217f9c5f3bd99d5e0f53e74a98941bba4f 100644
--- a/EtsiServerImpl/src/TrackableApiEtsi.h
+++ b/EtsiServerImpl/src/TrackableApiEtsi.h
@@ -1,3 +1,23 @@
+//
+// ARF - Augmented Reality Framework (ETSI ISG ARF)
+//
+// Copyright 2022 ETSI
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// Last change: June 2022
+//
+
 #ifndef TrackableApiEtsi_H_
 #define TrackableApiEtsi_H_
 
diff --git a/EtsiServerImpl/src/WorldStorageManager.cpp b/EtsiServerImpl/src/WorldStorageManager.cpp
index aa041c6005eb2a260e65d6031d7bf6c6f5a4266f..7ffa6436bc930e1a3cd45f7d7f93d73c0f34d2c8 100644
--- a/EtsiServerImpl/src/WorldStorageManager.cpp
+++ b/EtsiServerImpl/src/WorldStorageManager.cpp
@@ -1,3 +1,23 @@
+//
+// ARF - Augmented Reality Framework (ETSI ISG ARF)
+//
+// Copyright 2022 ETSI
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// Last change: June 2022
+//
+
 #include "WorldStorageManager.h"
 #include <thread>
 #include <iostream>
@@ -47,4 +67,4 @@ org::openapitools::server::model::Trackable WorldStorageManager::getTrackableByI
  */
 
 WorldStorageManager* WorldStorageManager::pinstance_{nullptr};
-std::mutex WorldStorageManager::mutex_;
\ No newline at end of file
+std::mutex WorldStorageManager::mutex_;
diff --git a/EtsiServerImpl/src/WorldStorageManager.h b/EtsiServerImpl/src/WorldStorageManager.h
index f99b53893478546fa4b7f472f4a3024705994f29..444020cf885b3b947cf0aec400eb2d6d40605bc3 100644
--- a/EtsiServerImpl/src/WorldStorageManager.h
+++ b/EtsiServerImpl/src/WorldStorageManager.h
@@ -1,3 +1,23 @@
+//
+// ARF - Augmented Reality Framework (ETSI ISG ARF)
+//
+// Copyright 2022 ETSI
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// Last change: June 2022
+//
+
 #ifndef WORLDSTORAGEMANAGER_H_
 #define WORLDSTORAGEMANAGER_H_
 
@@ -55,4 +75,4 @@ public:
     org::openapitools::server::model::Trackable getTrackableById(boost::uuids::uuid trackableId);
 };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/EtsiServerImpl/src/main.cpp b/EtsiServerImpl/src/main.cpp
index 609eb592cb1c7adce54da69a2767c7cad623a932..73806707a980f92360f24c13d96e8e5b461fd757 100644
--- a/EtsiServerImpl/src/main.cpp
+++ b/EtsiServerImpl/src/main.cpp
@@ -1,3 +1,23 @@
+//
+// ARF - Augmented Reality Framework (ETSI ISG ARF)
+//
+// Copyright 2022 ETSI
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// Last change: June 2022
+//
+
 #include "pistache/endpoint.h"
 #include "pistache/http.h"
 #include "pistache/router.h"
diff --git a/arf005 b/arf005
index 5da5faa719bcb310bc57ae97168e582218d1355c..533b9d3198b772c7b628b0ab0e0a144b89966b46 160000
--- a/arf005
+++ b/arf005
@@ -1 +1 @@
-Subproject commit 5da5faa719bcb310bc57ae97168e582218d1355c
+Subproject commit 533b9d3198b772c7b628b0ab0e0a144b89966b46
diff --git a/package.json b/package.json
index 413e57ac21fe2487e286ba47b703d7ce20d4bc61..dd60ec8f7fe1ea218d53360d0a2e029dbb627d84 100644
--- a/package.json
+++ b/package.json
@@ -1,4 +1,23 @@
 {
+  "//": [
+	"ARF - Augmented Reality Framework (ETSI ISG ARF)",
+
+	"Copyright 2022 ETSI",
+
+	"Licensed under the Apache License, Version 2.0 (the \"License\");",
+	"you may not use this file except in compliance with the License.",
+	"You may obtain a copy of the License at",
+
+     	"http://www.apache.org/licenses/LICENSE-2.0",
+
+	"Unless required by applicable law or agreed to in writing, software",
+	"distributed under the License is distributed on an \"AS IS\" BASIS,",
+	"WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.",
+	"See the License for the specific language governing permissions and",
+	"limitations under the License.",
+
+	"Last change: June 2022"
+	],
   "name": "worldstorageserver",
   "version": "0.0.1",
   "description": "ISG ARF World Storage Cpp Server",