diff --git a/SMARTCITIES/SMARTPORTS/NEW_PORT/PortCallEvent/comments.txt b/SMARTCITIES/SMARTPORTS/NEW_PORT/PortCallEvent/comments.txt
index 782f22c8a..57aa3acfd 100644
--- a/SMARTCITIES/SMARTPORTS/NEW_PORT/PortCallEvent/comments.txt
+++ b/SMARTCITIES/SMARTPORTS/NEW_PORT/PortCallEvent/comments.txt
@@ -16,4 +16,8 @@
 
 9.- source is a SDM common attribute, used the common one
 
-10.- 'uuid' tiene un pattern en el comentario pero podría tenerlo en la definción si fuera obligatorio.
\ No newline at end of file
+10.- 'uuid' tiene un pattern en el comentario pero podría tenerlo en la definción si fuera obligatorio.
+
+11.- The value of eventContext does ot match the definition in the schema
+
+12.- Too many required attributes. removed some of them
\ No newline at end of file
diff --git a/SMARTCITIES/SMARTPORTS/NEW_PORT/PortCallEvent/examples/example.json b/SMARTCITIES/SMARTPORTS/NEW_PORT/PortCallEvent/examples/example.json
index 3098d3a73..4fb16d5c5 100644
--- a/SMARTCITIES/SMARTPORTS/NEW_PORT/PortCallEvent/examples/example.json
+++ b/SMARTCITIES/SMARTPORTS/NEW_PORT/PortCallEvent/examples/example.json
@@ -6,7 +6,7 @@
   "eventTime": "2023-01-01T07:30:00",
   "eventType": "anchorArea.eta.agent",
   "locationType": "anchorArea",
-  "location": "Fondeadero D",
+  "position": "Fondeadero D",
   "port": "ESHUV",
   "portcallId": "ESHUV202301296",
   "recordTime": "2023-01-01T07:30:00",
diff --git a/SMARTCITIES/SMARTPORTS/NEW_PORT/PortCallEvent/schema.json b/SMARTCITIES/SMARTPORTS/NEW_PORT/PortCallEvent/schema.json
index 2b85774d3..40d1f30b2 100644
--- a/SMARTCITIES/SMARTPORTS/NEW_PORT/PortCallEvent/schema.json
+++ b/SMARTCITIES/SMARTPORTS/NEW_PORT/PortCallEvent/schema.json
@@ -24,13 +24,12 @@
             "PortCallEvent"
           ]
         },
-
         "eventContext": {
-          "$ref": "https://raw.githubusercontent.com/smart-data-models/incubated/master/SMARTCITIES/SMARTPORTS/NEW_PORT/MarineTransport-schema.json#/definitions/IEventContext",
+          "$ref": "https://smart-data-models.github.io/incubated/SMARTCITIES/SMARTPORTS/NEW_PORT/MarineTransport-schema.json#/definitions/IEventContext",
           "description": "EventContext is a key-value object in which users are allowed to put custom keys for any purposes. The following keys have pre-defined meanings within the spec. Keys in this object are always optional"
         },
         "eventTime": {
-          "description": "Time at which the event occured/will occur. The meaning of this should be interperted according to eventType",
+          "description": "Time at which the event occurred/will occur. The meaning of this should be interpreted according to eventType",
           "format": "date-time",
           "type": "string"
         },
@@ -259,7 +258,7 @@
           "type": "string"
         },
         "eventLocation": {
-          "$ref": "https://raw.githubusercontent.com/smart-data-models/incubated/master/SMARTCITIES/SMARTPORTS/NEW_PORT/MarineTransport-schema.json#/definitions/IEeventLocation",
+          "$ref": "https://smart-data-models.github.io/incubated/SMARTCITIES/SMARTPORTS/NEW_PORT/MarineTransport-schema.json#/definitions/IEventContext",
           "description": "Property. Identifies a physical location at which the event will take place"
         },
         "port": {
@@ -302,12 +301,6 @@
     "id",
     "type",
     "eventTime",
-    "eventType",
-    "port",
-    "recordTime",
-    "ship",
-    "source",
-    "uuid",
-    "version"
+    "eventType"
   ]
 }
diff --git a/SMARTCITIES/SMARTPORTS/NEW_PORT/PortCallVessel/examples/example.json b/SMARTCITIES/SMARTPORTS/NEW_PORT/PortCallVessel/examples/example.json
index 03c9b0409..22e597310 100644
--- a/SMARTCITIES/SMARTPORTS/NEW_PORT/PortCallVessel/examples/example.json
+++ b/SMARTCITIES/SMARTPORTS/NEW_PORT/PortCallVessel/examples/example.json
@@ -1,32 +1,27 @@
 {
   "id": "urn:mrn:eshuv:portcalls:portcallvessel:id:1234",
-  "type": "VesselAtPort",
+  "type": "PortCallVessel",
   "masterVesselRef": "urn:mrn:eshuv:portcalls:mastervessel:imo:9863637",
   "imo": 9863637,
   "mmsi": 210049000,
   "callSign": "5BPC3",
   "name": "ELEANOR R.",
-  "portCallNumber":   "ESHUV202300123",
+  "portCallNumber": "ESHUV202300123",
   "portCallRef": "urn:mrn:eshuv:portcalls:portcall:id:941",
-
-  "portCode":   "ESHUV",
+  "portCode": "ESHUV",
   "lastPortCode": "ESPMI",
   "nextPortCode": "ESVLC",
   "etaAis": "2023-03-01T07:00:00.00Z",
   "etaAlgorithm": "2023-03-02T07:00:00.00Z",
-
   "loa": 132,
   "gt": 23.200,
   "specialManeuverIndicator": 1,
   "manager": "Acme MANAGER NAME",
-
   "draught": 4,
   "arrivalDraught": 7,
   "departureDraught": 4,
   "airDraught": 4,
-
   "navigationStatus": 4,
-
   "location": {
     "type": "Point",
     "coordinates": [
@@ -35,13 +30,11 @@
     ]
   },
   "positionAccuracy": 0,
-
   "speedOverGround": 11.3,
   "courseOverGround": 1,
   "heading": 1,
   "rateOfTurn": 1,
   "dataProvider": "PilotSystem",
-
   "createdAt": "2023-06-01T07:00:00",
   "modifiedAt": "2022-06-01T07:00:00",
   "observedAt": "2022-06-01T07:00:00"