diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8a36a00a7161b936523b20e9de02ca204983c528..061e8b5e4144bf4e8f8d8b1e0ee831d2da91d8e4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,82 +1,84 @@
-variables:
-    GIT_STRATEGY: fetch
-    GIT_DEPTH: 0
-    SAREF_DEV_KEY: <my_private_key>
-    SAREF_PORTAL_KEY: <my_private_key>
-
-stages:
-  - test
-  - build
-  - deploy
-
-
-test-develop:
-  stage: test
-  image: openjdk:11-jre
-  script:
-    - curl -L -o saref-pipeline.jar "https://labs.etsi.org/rep/saref/saref-pipeline/-/releases/permalink/latest/downloads/saref-pipeline.jar"
-    - java -jar saref-pipeline.jar develop -s && touch target/success
-  allow_failure: true
-  except:
-    - /^prerelease-v/
-    - /^release-v/
-  artifacts:
-    when: always
-    paths:
-      - target/site
-      - target/success
-    reports:
-      junit: target/report_output.xml
-
-test-prerelease:
-  stage: test
-  image: openjdk:11-jre
-  script:
-    - curl -L -o saref-pipeline.jar "https://labs.etsi.org/rep/saref/saref-pipeline/-/releases/permalink/latest/downloads/saref-pipeline.jar"
-    - java -jar saref-pipeline.jar release -t && touch target/success
-  allow_failure: true
-  only:
-    - /^prerelease-v/
-  artifacts:
-    when: always
-    paths:
-      - target/site
-      - target/success
-    reports:
-      junit: target/report_output.xml
-
-deploy-report:
-  stage: deploy
-  image: alpine:latest
-  script:
-    - apk update
-    - apk add openssh
-    - eval $(ssh-agent -s)
-    - ssh-add <(echo "$SAREF_DEV_KEY")
-    - mkdir -p ~/.ssh
-    - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
-    - scp -P 29419 -pr target/site saref-dev@saref.etsi.org:~/snapshot/$CI_PIPELINE_ID
-    - echo "SAREF pipeline report  https://saref.etsi.org/snapshot/$CI_PIPELINE_ID/report.html" 
-    - exit $(test -f target/success) $?
-  except:
-    - /^release-v/
-
-test-release:
-  stage: test
-  image: openjdk:11-jre
-  script:
-    - curl -L -o saref-pipeline.jar "https://labs.etsi.org/rep/saref/saref-pipeline/-/releases/permalink/latest/downloads/saref-pipeline.jar"
-    - java -jar saref-pipeline.jar release -t
-  only:
-    - /^release-v/
-
-trigger-release:
-  stage: deploy
-  only:
-    - /^release-v/
-  variables:
-    SAREF_DEV_KEY: $SAREF_DEV_KEY
-    SAREF_PORTAL_KEY: $SAREF_PORTAL_KEY
-  trigger:
-    project: saref/saref-portal
-    branch: master
+variables:
+    GIT_STRATEGY: fetch
+    GIT_DEPTH: 0
+    SAREF_DEV_KEY: <my_private_key>
+    SAREF_PORTAL_KEY: <my_private_key>
+    SAREF_PORT: <port>
+
+stages:
+  - test
+  - build
+  - deploy
+
+
+test-develop:
+  stage: test
+  image: openjdk:11-jre
+  script:
+    - curl -L -o saref-pipeline.jar "https://labs.etsi.org/rep/saref/saref-pipeline/-/releases/permalink/latest/downloads/saref-pipeline.jar"
+    - java -jar saref-pipeline.jar develop -s && touch target/success
+  allow_failure: true
+  except:
+    - /^prerelease-v/
+    - /^release-v/
+  artifacts:
+    when: always
+    paths:
+      - target/site
+      - target/success
+    reports:
+      junit: target/report_output.xml
+
+test-prerelease:
+  stage: test
+  image: openjdk:11-jre
+  script:
+    - curl -L -o saref-pipeline.jar "https://labs.etsi.org/rep/saref/saref-pipeline/-/releases/permalink/latest/downloads/saref-pipeline.jar"
+    - java -jar saref-pipeline.jar release -t && touch target/success
+  allow_failure: true
+  only:
+    - /^prerelease-v/
+  artifacts:
+    when: always
+    paths:
+      - target/site
+      - target/success
+    reports:
+      junit: target/report_output.xml
+
+deploy-report:
+  stage: deploy
+  image: alpine:latest
+  script:
+    - apk update
+    - apk add openssh
+    - echo "172.29.10.32    saref.etsi.org" >> /etc/hosts
+    - eval $(ssh-agent -s)
+    - ssh-add <(echo "$SAREF_DEV_KEY")
+    - mkdir -p ~/.ssh
+    - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
+    - scp -P $SAREF_PORT -O -pr target/site saref-dev@saref.etsi.org:~/snapshot/$CI_PIPELINE_ID
+    - echo "SAREF pipeline report  https://saref.etsi.org/snapshot/$CI_PIPELINE_ID/report.html" 
+    - exit $(test -f target/success) $?
+  except:
+    - /^release-v/
+
+test-release:
+  stage: test
+  image: openjdk:11-jre
+  script:
+    - curl -L -o saref-pipeline.jar "https://labs.etsi.org/rep/saref/saref-pipeline/-/releases/permalink/latest/downloads/saref-pipeline.jar"
+    - java -jar saref-pipeline.jar release -t
+  only:
+    - /^release-v/
+
+trigger-release:
+  stage: deploy
+  only:
+    - /^release-v/
+  variables:
+    SAREF_DEV_KEY: $SAREF_DEV_KEY
+    SAREF_PORTAL_KEY: $SAREF_PORTAL_KEY
+  trigger:
+    project: saref/saref-portal
+    branch: master
diff --git a/ontology/saref.ttl b/ontology/saref.ttl
index 859793f7d2d707b1fc206f824b4f2b38518841b7..0e2eb2340519727cc4023fb1228e84a677e1d4ac 100644
--- a/ontology/saref.ttl
+++ b/ontology/saref.ttl
@@ -946,8 +946,8 @@ saref:hasPropertyValue
 saref:isValueOfProperty a owl:ObjectProperty ;
     rdfs:label "is value of property"@en ;
     rdfs:comment "Links a property value to the property or property of interest it is a value of."@en ;
-    rdfs:domain [ a owl:Class ; owl:unionOf ( saref:FeatureKind saref:FeatureOfInterest saref:PropertyOfInterest ) ] ;
-    rdfs:range saref:PropertyValue ;
+    rdfs:domain saref:PropertyValue ;
+    rdfs:range [ a owl:Class ; owl:unionOf ( saref:Property saref:PropertyOfInterest ) ] ;
     skos:historyNote "V3.2.1: Introduced saref:isValueOfProperty."@en .
 
 
@@ -1509,14 +1509,14 @@ saref:isCommandOf a owl:ObjectProperty ;
     rdfs:range [ a owl:Class ; owl:unionOf ( saref:Function saref:FunctionOfInterest ) ] .
 
 saref:hasMandatoryCommand a owl:ObjectProperty ;
-    owl:subPropertyOf saref:hasCommand ;
+    rdfs:subPropertyOf saref:hasCommand ;
     rdfs:label "has mandatory command"@en ;
     rdfs:comment "Links a function and one of its mandatory commands"@en ;
     rdfs:domain saref:Function ;
     skos:historyNote "V3.2.1: Introduced mandatory and optional commands."@en .
 
 saref:hasOptionalCommand a owl:ObjectProperty ;
-    owl:subPropertyOf saref:hasCommand ;
+    rdfs:subPropertyOf saref:hasCommand ;
     rdfs:label "has optional command"@en ;
     rdfs:comment "Links a function and one of its optional commands"@en ;
     rdfs:domain saref:Function .
@@ -1579,7 +1579,7 @@ saref:isCommandOfInterestOf a owl:ObjectProperty , owl:FunctionalProperty ;
     rdfs:comment "Links a command of interest to the function of interest it is a command of."@en ;
     rdfs:label "is command of interest of"@en ;
     rdfs:domain saref:CommandOfInterest ;
-    rdfs:range saref:FeatureOfInterest .
+    rdfs:range saref:FunctionOfInterest .
 
 ## A command of interest is the command of (OP saref:isCommandOfInterestOf) exactly one function of interest.