diff --git a/behaverse_data_analysis.v1.owl b/behaverse_data_analysis.v1.owl
index 88a8f41..0eb79f1 100644
--- a/behaverse_data_analysis.v1.owl
+++ b/behaverse_data_analysis.v1.owl
@@ -6,90 +6,109 @@
 Prefix(rdfs:=<http://www.w3.org/2000/01/rdf-schema#>)
 
 
-Ontology(<http://xcit.org/ontologies/behaverse-data-analysis>
+Ontology(<http://xcit.org/ontologies/behaverse/data-analysis>
 
-Declaration(Class(:Action))
-Declaration(Class(:Agent))
-Declaration(Class(:Behavior))
-Declaration(Class(:Episode))
-Declaration(Class(:Input))
-Declaration(Class(:Paradigm))
-Declaration(Class(:Participant))
-Declaration(Class(:Player))
-Declaration(Class(:Protocol))
-Declaration(Class(:Response))
-Declaration(Class(:Study))
-Declaration(Class(:Task))
-Declaration(Class(:User))
-Declaration(Class(:VirtualAgent))
-Declaration(ObjectProperty(:Pattern))
-Declaration(ObjectProperty(:ResponsePattern))
-Declaration(ObjectProperty(:StimulusPattern))
-Declaration(ObjectProperty(:TaskPattern))
-Declaration(ObjectProperty(:hasPart))
-Declaration(ObjectProperty(:isPartOf))
+Declaration(Class(<http://xcit.org/ontologies/behaverse/data-analysis#Action>))
+Declaration(Class(<http://xcit.org/ontologies/behaverse/data-analysis#Agent>))
+Declaration(Class(<http://xcit.org/ontologies/behaverse/data-analysis#Behavior>))
+Declaration(Class(<http://xcit.org/ontologies/behaverse/data-analysis#Configurator>))
+Declaration(Class(<http://xcit.org/ontologies/behaverse/data-analysis#Device>))
+Declaration(Class(<http://xcit.org/ontologies/behaverse/data-analysis#Episode>))
+Declaration(Class(<http://xcit.org/ontologies/behaverse/data-analysis#Input>))
+Declaration(Class(<http://xcit.org/ontologies/behaverse/data-analysis#Modulator>))
+Declaration(Class(<http://xcit.org/ontologies/behaverse/data-analysis#Observable>))
+Declaration(Class(<http://xcit.org/ontologies/behaverse/data-analysis#Paradigm>))
+Declaration(Class(<http://xcit.org/ontologies/behaverse/data-analysis#Participant>))
+Declaration(Class(<http://xcit.org/ontologies/behaverse/data-analysis#Player>))
+Declaration(Class(<http://xcit.org/ontologies/behaverse/data-analysis#Protocol>))
+Declaration(Class(<http://xcit.org/ontologies/behaverse/data-analysis#Response>))
+Declaration(Class(<http://xcit.org/ontologies/behaverse/data-analysis#Session>))
+Declaration(Class(<http://xcit.org/ontologies/behaverse/data-analysis#Stimulus>))
+Declaration(Class(<http://xcit.org/ontologies/behaverse/data-analysis#StimulusType>))
+Declaration(Class(<http://xcit.org/ontologies/behaverse/data-analysis#Study>))
+Declaration(Class(<http://xcit.org/ontologies/behaverse/data-analysis#Task>))
+Declaration(Class(<http://xcit.org/ontologies/behaverse/data-analysis#User>))
+Declaration(Class(<http://xcit.org/ontologies/behaverse/data-analysis#VirtualAgent>))
+Declaration(ObjectProperty(<http://xcit.org/ontologies/behaverse/data-analysis#Pattern>))
+Declaration(ObjectProperty(<http://xcit.org/ontologies/behaverse/data-analysis#ResponsePattern>))
+Declaration(ObjectProperty(<http://xcit.org/ontologies/behaverse/data-analysis#StimulusPattern>))
+Declaration(ObjectProperty(<http://xcit.org/ontologies/behaverse/data-analysis#TaskPattern>))
+Declaration(ObjectProperty(<http://xcit.org/ontologies/behaverse/data-analysis#hasPart>))
+Declaration(ObjectProperty(<http://xcit.org/ontologies/behaverse/data-analysis#hasRole>))
+Declaration(ObjectProperty(<http://xcit.org/ontologies/behaverse/data-analysis#isPartOf>))
+Declaration(ObjectProperty(<http://xcit.org/ontologies/behaverse/data-analysis#uses>))
+Declaration(DataProperty(<http://xcit.org/ontologies/behaverse/data-analysis#hasAttribute>))
 ############################
 #   Object Properties
 ############################
 
-# Object Property: :ResponsePattern (:ResponsePattern)
+# Object Property: <http://xcit.org/ontologies/behaverse/data-analysis#ResponsePattern> (<http://xcit.org/ontologies/behaverse/data-analysis#ResponsePattern>)
 
-SubObjectPropertyOf(:ResponsePattern :Pattern)
+SubObjectPropertyOf(<http://xcit.org/ontologies/behaverse/data-analysis#ResponsePattern> <http://xcit.org/ontologies/behaverse/data-analysis#Pattern>)
 
-# Object Property: :StimulusPattern (:StimulusPattern)
+# Object Property: <http://xcit.org/ontologies/behaverse/data-analysis#StimulusPattern> (<http://xcit.org/ontologies/behaverse/data-analysis#StimulusPattern>)
 
-SubObjectPropertyOf(:StimulusPattern :Pattern)
+SubObjectPropertyOf(<http://xcit.org/ontologies/behaverse/data-analysis#StimulusPattern> <http://xcit.org/ontologies/behaverse/data-analysis#Pattern>)
 
-# Object Property: :TaskPattern (:TaskPattern)
+# Object Property: <http://xcit.org/ontologies/behaverse/data-analysis#TaskPattern> (<http://xcit.org/ontologies/behaverse/data-analysis#TaskPattern>)
 
-SubObjectPropertyOf(:TaskPattern :Pattern)
+SubObjectPropertyOf(<http://xcit.org/ontologies/behaverse/data-analysis#TaskPattern> <http://xcit.org/ontologies/behaverse/data-analysis#Pattern>)
 
-# Object Property: :hasPart (:hasPart)
+# Object Property: <http://xcit.org/ontologies/behaverse/data-analysis#hasPart> (<http://xcit.org/ontologies/behaverse/data-analysis#hasPart>)
 
-InverseObjectProperties(:hasPart :isPartOf)
+InverseObjectProperties(<http://xcit.org/ontologies/behaverse/data-analysis#hasPart> <http://xcit.org/ontologies/behaverse/data-analysis#isPartOf>)
+
+# Object Property: <http://xcit.org/ontologies/behaverse/data-analysis#hasRole> (<http://xcit.org/ontologies/behaverse/data-analysis#hasRole>)
+
+ObjectPropertyDomain(<http://xcit.org/ontologies/behaverse/data-analysis#hasRole> <http://xcit.org/ontologies/behaverse/data-analysis#Stimulus>)
+
 
 
 ############################
 #   Classes
 ############################
 
-# Class: :Action (:Action)
+# Class: <http://xcit.org/ontologies/behaverse/data-analysis#Action> (<http://xcit.org/ontologies/behaverse/data-analysis#Action>)
 
-SubClassOf(:Action :Input)
+SubClassOf(<http://xcit.org/ontologies/behaverse/data-analysis#Action> <http://xcit.org/ontologies/behaverse/data-analysis#Input>)
 
-# Class: :Behavior (:Behavior)
+# Class: <http://xcit.org/ontologies/behaverse/data-analysis#Agent> (<http://xcit.org/ontologies/behaverse/data-analysis#Agent>)
 
-SubClassOf(:Behavior :Response)
-SubClassOf(:Behavior ObjectMinCardinality(1 :hasPart :Response))
+SubClassOf(<http://xcit.org/ontologies/behaverse/data-analysis#Agent> ObjectSomeValuesFrom(<http://xcit.org/ontologies/behaverse/data-analysis#uses> <http://xcit.org/ontologies/behaverse/data-analysis#Device>))
 
-# Class: :Paradigm (:Paradigm)
+# Class: <http://xcit.org/ontologies/behaverse/data-analysis#Behavior> (<http://xcit.org/ontologies/behaverse/data-analysis#Behavior>)
 
-SubClassOf(:Paradigm :Task)
+SubClassOf(<http://xcit.org/ontologies/behaverse/data-analysis#Behavior> <http://xcit.org/ontologies/behaverse/data-analysis#Response>)
+SubClassOf(<http://xcit.org/ontologies/behaverse/data-analysis#Behavior> ObjectMinCardinality(1 <http://xcit.org/ontologies/behaverse/data-analysis#hasPart> <http://xcit.org/ontologies/behaverse/data-analysis#Response>))
 
-# Class: :Participant (:Participant)
+# Class: <http://xcit.org/ontologies/behaverse/data-analysis#Paradigm> (<http://xcit.org/ontologies/behaverse/data-analysis#Paradigm>)
 
-SubClassOf(:Participant :Agent)
+SubClassOf(<http://xcit.org/ontologies/behaverse/data-analysis#Paradigm> <http://xcit.org/ontologies/behaverse/data-analysis#Task>)
 
-# Class: :Player (:Player)
+# Class: <http://xcit.org/ontologies/behaverse/data-analysis#Participant> (<http://xcit.org/ontologies/behaverse/data-analysis#Participant>)
 
-SubClassOf(:Player :User)
+SubClassOf(<http://xcit.org/ontologies/behaverse/data-analysis#Participant> <http://xcit.org/ontologies/behaverse/data-analysis#User>)
 
-# Class: :Protocol (:Protocol)
+# Class: <http://xcit.org/ontologies/behaverse/data-analysis#Player> (<http://xcit.org/ontologies/behaverse/data-analysis#Player>)
 
-SubClassOf(:Protocol :Task)
+SubClassOf(<http://xcit.org/ontologies/behaverse/data-analysis#Player> <http://xcit.org/ontologies/behaverse/data-analysis#User>)
 
-# Class: :Response (:Response)
+# Class: <http://xcit.org/ontologies/behaverse/data-analysis#Protocol> (<http://xcit.org/ontologies/behaverse/data-analysis#Protocol>)
 
-SubClassOf(:Response :Action)
-SubClassOf(:Response ObjectSomeValuesFrom(:isPartOf :Behavior))
+SubClassOf(<http://xcit.org/ontologies/behaverse/data-analysis#Protocol> <http://xcit.org/ontologies/behaverse/data-analysis#Task>)
 
-# Class: :User (:User)
+# Class: <http://xcit.org/ontologies/behaverse/data-analysis#Response> (<http://xcit.org/ontologies/behaverse/data-analysis#Response>)
 
-SubClassOf(:User :Participant)
+SubClassOf(<http://xcit.org/ontologies/behaverse/data-analysis#Response> <http://xcit.org/ontologies/behaverse/data-analysis#Action>)
+SubClassOf(<http://xcit.org/ontologies/behaverse/data-analysis#Response> ObjectSomeValuesFrom(<http://xcit.org/ontologies/behaverse/data-analysis#isPartOf> <http://xcit.org/ontologies/behaverse/data-analysis#Behavior>))
 
-# Class: :VirtualAgent (:VirtualAgent)
+# Class: <http://xcit.org/ontologies/behaverse/data-analysis#User> (<http://xcit.org/ontologies/behaverse/data-analysis#User>)
 
-SubClassOf(:VirtualAgent :Agent)
+SubClassOf(<http://xcit.org/ontologies/behaverse/data-analysis#User> <http://xcit.org/ontologies/behaverse/data-analysis#Agent>)
+
+# Class: <http://xcit.org/ontologies/behaverse/data-analysis#VirtualAgent> (<http://xcit.org/ontologies/behaverse/data-analysis#VirtualAgent>)
+
+SubClassOf(<http://xcit.org/ontologies/behaverse/data-analysis#VirtualAgent> <http://xcit.org/ontologies/behaverse/data-analysis#Agent>)
 
 
 )
\ No newline at end of file