diff --git a/Documentation/sbeo_Description.docx b/Documentation/sbeo_Description.docx
deleted file mode 100644
index 622871f..0000000
Binary files a/Documentation/sbeo_Description.docx and /dev/null differ
diff --git a/Documentation/sbeo_Description.pdf b/Documentation/sbeo_Description.pdf
deleted file mode 100644
index b1b006e..0000000
Binary files a/Documentation/sbeo_Description.pdf and /dev/null differ
diff --git a/Figures/SBEO_ClassProperty_Diagram.png b/Figures/SBEO_ClassProperty_Diagram.png
new file mode 100644
index 0000000..366c279
Binary files /dev/null and b/Figures/SBEO_ClassProperty_Diagram.png differ
diff --git a/Serialization/sbeo.ttl b/Serialization/sbeo.ttl
index 9fc0984..8e18104 100644
--- a/Serialization/sbeo.ttl
+++ b/Serialization/sbeo.ttl
@@ -1,4 +1,6 @@
-@prefix : <https://w3id.org/sbeo#> .
+
+@prefix sbeo: <https://w3id.org/sbeo#> .
+
 @prefix dc: <http://purl.org/dc/elements/1.1/> .
 @prefix olo: <http://purl.org/ontology/olo/core#> .
 @prefix owl: <http://www.w3.org/2002/07/owl#> .
@@ -7,7 +9,6 @@
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 @prefix foaf: <http://xmlns.com/foaf/0.1/> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix sbeo: <https://w3id.org/sbeo#> .
 @prefix seas: <https://w3id.org/seas/> .
 @prefix sosa: <http://www.w3.org/ns/sosa/> .
 @prefix schema: <http://schema.org/> .
diff --git a/docs/index.html b/docs/index.html
index f476511..c82855c 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -22,6 +22,13 @@
 <script src="resources/jquery.js"></script> 
 <script src="resources/marked.min.js"></script> 
     <script> 
+	
+<!-- Visualization WebLink JS function  -->
+$('a.webvowllink').click(function(e) {
+	e.preventDefault();
+    window.open('https://service.tib.eu/webvowl/#iri=https://raw.githubusercontent.com/qasimkhalid/SBEO/v0.1/sbeo.owl');
+});
+
 function loadHash() {
   jQuery(".markdown").each(function(el){jQuery(this).after(marked(jQuery(this).text())).remove()});
 	var hash = location.hash;
@@ -61,17 +68,15 @@
 
 <body>
 <div class="container">
-<h1>SBEO: Smart Building Evacuation Ontology <a href="https://qasimkhalid.github.io/SBEO/"><img id="logo" src="https://github.com/qasimkhalid/SBEO/blob/master/Figures/logo/sbeo_logo.png?raw=true" alt="sbeo Ontology" style="float:right"></a> 
+<h1>SBEO: Smart Building Evacuation Ontology <a href="https://qasimkhalid.github.io/SBEO/"><img id="logo" src="https://github.com/qasimkhalid/SBEO/blob/v0.1/Figures/logo/sbeo_logo.png?raw=true" alt="sbeo Ontology" style="float:right"></a> 
 </h1>
 
 <div class="head">
 <dl>
 <dt>This version:</dt>
-<dd><a href="https://w3id.org/sbeo">https://w3id.org/sbeo</a></dd>
+<dd><a href="https://raw.githubusercontent.com/qasimkhalid/SBEO/v0.1/docs/index.html">https://w3id.org/sbeo/v0.1</a></dd>
 <dt>Latest version:</dt>
-<dd><a href="https://qasimkhalid.github.io/SBEO/">https://qasimkhalid.github.io/SBEO/</a></dd>
-<dt>Version:</dt>
-<dd>0.1</dd>
+<dd><a href="https://w3id.org/sbeo">https://w3id.org/sbeo/latestversion</a></dd>
 <dt>Authors:</dt>
 <dd>Qasim Khalid, URJC Spain and IMT Lille Douai France. (<a href="https://orcid.org/0000-0002-7944-2594">ORCID</a>) </dd>   
 
@@ -81,9 +86,9 @@ <h1>SBEO: Smart Building Evacuation Ontology <a href="https://qasimkhalid.github
 <dd>Arnaud Doniec, IMT Lille Douai, France (<a href="http://ia.ur.imt-lille-douai.fr/en/chercheurs/doniec_arnaud/">Web</a>, <a href="https://orcid.org/0000-0002-3843-6729">ORCID</a>) </dd>
 
 
-<dt>Download serialization:</dt><dd><span><a href="https://github.com/qasimkhalid/SBEO/raw/master/Serialization/sbeo_jsonld" target="_blank"><img src="https://img.shields.io/badge/Format-JSON_LD-blue.svg" alt="JSON-LD" /></a> </span><span><a href="https://github.com/qasimkhalid/SBEO/raw/master/Serialization/sbeo_rdfxml" target="_blank"><img src="https://img.shields.io/badge/Format-RDF/XML-blue.svg" alt="RDF/XML" /></a> </span><span><a href="https://github.com/qasimkhalid/SBEO/raw/master/Serialization/sbeo_nTriples" target="_blank"><img src="https://img.shields.io/badge/Format-N_Triples-blue.svg" alt="N-Triples" /></a> </span><span><a href="https://raw.githubusercontent.com/qasimkhalid/SBEO/master/sbeo.owl" target="_blank"><img src="https://img.shields.io/badge/Format-TTL-blue.svg" alt="TTL" /></a> </span></dd>
+<dt>Download serialization:</dt><dd><span><a href="https://github.com/qasimkhalid/SBEO/raw/v0.1/Serialization/sbeo.json" target="_blank"><img src="https://img.shields.io/badge/Format-JSON_LD-blue.svg" alt="JSON-LD" /></a> </span><span><a href="https://github.com/qasimkhalid/SBEO/raw/v0.1/Serialization/sbeo.rdf" target="_blank"><img src="https://img.shields.io/badge/Format-RDF/XML-blue.svg" alt="RDF/XML" /></a> </span><span><a href="https://github.com/qasimkhalid/SBEO/raw/v0.1/Serialization/sbeo.nt" target="_blank"><img src="https://img.shields.io/badge/Format-N_Triples-blue.svg" alt="N-Triples" /></a> </span><span><a href="https://raw.githubusercontent.com/qasimkhalid/SBEO/v0.1/sbeo.owl" target="_blank"><img src="https://img.shields.io/badge/Format-TTL-blue.svg" alt="TTL" /></a> </span></dd>
 <dt>License: </dt><dd><a href="https://www.gnu.org/licenses/gpl.html" target="_blank"><img src="https://img.shields.io/badge/License-https://www.gnu.org/licenses/gpl.html-blue.svg" alt="GPLv3" /></a>
-</dd><dt>Visualization:</dt><dd><a href="http://visualdataweb.de/webvowl/#iri=https://raw.githubusercontent.com/qasimkhalid/SBEO/master/sbeo.owl" target="_blank"><img src="https://img.shields.io/badge/Visualize_with-WebVowl-blue.svg" alt="Visualize with WebVowl" /></a></dd>
+</dd><dt>Visualization:</dt><dd><a href="#" class="webvowllink" target="_blank"><img src="https://img.shields.io/badge/Visualize_with-WebVowl-blue.svg" alt="Visualize with WebVowl" /></a></dd>
 <!-- <dt>Evaluation:</dt><dd><a href="OOPSEvaluation/OOPSeval.html#" target="_blank">
 <img src="https://img.shields.io/badge/Evaluate_with-OOPS! (OntOlogy Pitfall Scanner!)-blue.svg" alt="Evaluate with OOPS!" /></a></dd> -->
 
@@ -193,13 +198,25 @@ <h3 id="ns" class="list">Namespace declarations</h3>
 	
 	
 		<div class="img"> 
-				<a href="https://github.com/qasimkhalid/SBEO/blob/master/Figures/SBEO_Class_Diagram_updated.png?raw=true"><img src="https://github.com/qasimkhalid/SBEO/blob/master/Figures/SBEO_Class_Diagram_updated.png?raw=true" alt="Class Diagram for SBEO" class="wideimg" title="click to enlarge" style="border:0"></a> 
+				<a href="https://github.com/qasimkhalid/SBEO/blob/v0.1/Figures/SBEO_Class_Diagram_updated.png?raw=true"><img src="https://github.com/qasimkhalid/SBEO/blob/v0.1/Figures/SBEO_Class_Diagram_updated.png?raw=true" alt="Class Diagram for SBEO" class="wideimg" title="click to enlarge" style="border:0"></a> 
 			<figcaption>Figure 1: Class Diagram for SBEO </figcaption>
 		</div>
 	</div>
 	</figure>
-
-
+	
+	<p>SBEO class property diagram presented below shows the major concepts and their relationships.</p></span>
+	
+	<figure>
+	<div id="cc" align="center">
+	
+	
+		<div class="img"> 
+				<a href="https://github.com/qasimkhalid/SBEO/blob/v0.1/Figures/SBEO_ClassProperty_Diagram.png?raw=true"><img src="https://github.com/qasimkhalid/SBEO/blob/v0.1/Figures/SBEO_ClassProperty_Diagram.png?raw=true" alt="Class Diagram for SBEO" class="wideimg" title="click to enlarge" style="border:0"></a> 
+			<figcaption>Figure 2: Class and Properties Diagram for SBEO </figcaption>
+		</div>
+	</div>
+	</figure>
+	
 
    </div>
 	
@@ -2447,7 +2464,7 @@ <h3>Apartment<sup class="type-c" title="class">c</sup>
       <p>
          <strong>IRI:</strong> https://w3id.org/sbeo#Apartment</p>
       <div class="comment">
-         <span class="markdown">A suite of rooms usually on one floor of an apartment house (Cambridge English Dictionary).</span>
+         <span class="markdown">A suite of rooms usually on one floor of an apartment house (Cambridge English Dictionary).</span>
       </div>
       <dl class="description">
          <dt>has super-classes</dt>
@@ -6360,7 +6377,7 @@ <h3>Suite<sup class="type-c" title="class">c</sup>
       <p>
          <strong>IRI:</strong> https://w3id.org/sbeo#Suite</p>
       <div class="comment">
-         <span class="markdown">A suite of rooms usually on one floor of an apartment house (Cambridge English Dictionary). This term is normally used in hotels, resorts, guesthouses, etc.</span>
+         <span class="markdown">A suite of rooms usually on one floor of an apartment house (Cambridge English Dictionary). This term is normally used in hotels, resorts, guesthouses, etc.</span>
       </div>
       <dl class="description">
          <dt>has super-classes</dt>
@@ -7513,7 +7530,7 @@ <h3>Has Member<sup class="type-op" title="object property">op</sup>
       <p>
          <strong>IRI:</strong> https://w3id.org/sbeo#hasMember</p>
       <div class="comment">
-         <span class="markdown">Expresses one of the persons who compose a social group.</span>
+         <span class="markdown">Expresses one of the persons who compose a social group.</span>
       </div>
       <div class="description">
          <dl>
diff --git a/sbeo.owl b/sbeo.owl
index 3ace659..9ec4bba 100644
--- a/sbeo.owl
+++ b/sbeo.owl
@@ -1,3 +1,4 @@
+
 @prefix sbeo: <https://w3id.org/sbeo#> .
 
 @prefix dc: <http://purl.org/dc/elements/1.1/> .
@@ -10,28 +11,18 @@
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix seas: <https://w3id.org/seas/> .
 @prefix sosa: <http://www.w3.org/ns/sosa/> .
-@prefix vann: <http://purl.org/vocab/vann/> .
 @prefix schema: <http://schema.org/> .
 @prefix dcterms: <http://purl.org/dc/terms/> .
 @base <https://w3id.org/sbeo> .
 
 <https://w3id.org/sbeo> rdf:type owl:Ontology ;
                          dc:rights <https://www.gnu.org/licenses/gpl.html> ;
-                         dcterms:contributor <https://orcid.org/0000-0001-8565-9194> ,
-                                             <https://orcid.org/0000-0002-3843-6729> ,
-                                             <https://orcid.org/0000-0002-8962-6856> ;
-                         dcterms:creator <https://orcid.org/0000-0002-7944-2594> ;
-                         dcterms:description """Smart Building Evacuation Ontology (SBEO) couples the information about any building with its occupants such that it can be used in many useful ways. For example, indoor localization of people, detection of any hazard, a recommendation of normal routes such as shopping or stadium seating routes, or safe and feasible emergency evacuation routes or both of them all together.  
-
-The core SBEO covers the concepts related to the geometry of building, devices and components of the building, route graphs correspondent to the building topology, users’ characteristics and preferences, situational awareness of both building (hazard detection, status of spaces (or routes) in terms of availability and occupancy) and users (tracking, management of groups, status in terms of fitness), and emergency evacuation. 
+                         dcterms:creator "Qasim Khalid" ;
+                         dcterms:description """Smart Building Evacuation Ontology (SBEO) is an ontology that couples the information about any building with its occupants such that it can be used in many useful ways. For example, indoor localization of people, detection of any hazard, a recommendation of normal routes such as shopping or stadium seating routes, or safe and feasible emergency evacuation routes or both of them all together.  
 
-Several other parameters related to the spaces, users and context are also described in SBEO. For example, SpaceSafety, PersonAccessbility, etc. Moreover, intensity, severity, and the impact of events and activites are also conceptualized."""@en ;
-                         dcterms:issued "2020-07-12" ;
+The core SBEO covers the concepts related to the geometry of building, devices and components of the building, route graphs correspondent to the building topology, users’ characteristics and preferences, situational awareness of both building (hazard detection, status of routes in terms of availability and occupancy) and users (tracking, management of groups, status in terms of fitness), and emergency evacuation."""@en ;
                          dcterms:language "en" ;
-                         dcterms:modified "2021-02-23" ;
                          dcterms:title "SBEO: Smart Building Evacuation Ontology"@en ;
-                         vann:preferredNamespacePrefix "sbeo" ;
-                         vann:preferredNamespaceUri sbeo: ;
                          rdfs:seeAlso <https://github.com/qasimkhalid/SBEO> ;
                          owl:versionInfo 0.1 .
 
@@ -43,10 +34,6 @@ Several other parameters related to the spaces, users and context are also descr
 dc:rights rdf:type owl:AnnotationProperty .
 
 
-###  http://purl.org/dc/terms/contributor
-dcterms:contributor rdf:type owl:AnnotationProperty .
-
-
 ###  http://purl.org/dc/terms/creator
 dcterms:creator rdf:type owl:AnnotationProperty .
 
@@ -55,30 +42,14 @@ dcterms:creator rdf:type owl:AnnotationProperty .
 dcterms:description rdf:type owl:AnnotationProperty .
 
 
-###  http://purl.org/dc/terms/issued
-dcterms:issued rdf:type owl:AnnotationProperty .
-
-
 ###  http://purl.org/dc/terms/language
 dcterms:language rdf:type owl:AnnotationProperty .
 
 
-###  http://purl.org/dc/terms/modified
-dcterms:modified rdf:type owl:AnnotationProperty .
-
-
 ###  http://purl.org/dc/terms/title
 dcterms:title rdf:type owl:AnnotationProperty .
 
 
-###  http://purl.org/vocab/vann/preferredNamespacePrefix
-vann:preferredNamespacePrefix rdf:type owl:AnnotationProperty .
-
-
-###  http://purl.org/vocab/vann/preferredNamespaceUri
-vann:preferredNamespaceUri rdf:type owl:AnnotationProperty .
-
-
 ###  http://schema.org/domainIncludes
 schema:domainIncludes rdf:type owl:AnnotationProperty .
 
@@ -2710,5 +2681,3 @@ sbeo:Walking rdf:type owl:NamedIndividual ;
              rdfs:comment "An unhurried rate of movement on foot (Oxford Dictionary of English)."@en ;
              rdfs:label "Walking"@en .
 
-
-###  Generated by the OWL API (version 4.5.9.2019-02-01T07:24:44Z) https://github.com/owlcs/owlapi
