diff --git a/cds_dojson/schemas/deposits/records/videos/project/project-v1.0.0.json b/cds_dojson/schemas/deposits/records/videos/project/project-v1.0.0.json
index fe68a54a..7e723ffc 100644
--- a/cds_dojson/schemas/deposits/records/videos/project/project-v1.0.0.json
+++ b/cds_dojson/schemas/deposits/records/videos/project/project-v1.0.0.json
@@ -3,241 +3,6 @@
   "$schema": "http://json-schema.org/draft-04/schema#",
   "type": "object",
   "additionalProperties": false,
-  "definitions": {
-    "title": {
-      "description": "A name given to the resource. Typically, a Title will be a name by which the resource is formally known.",
-      "additionalProperties": false,
-      "required": [
-        "title"
-      ],
-      "properties": {
-        "title": {
-          "type": "string"
-        },
-        "source": {
-          "type": "string"
-        },
-        "subtitle": {
-          "type": "string"
-        }
-      },
-      "type": "object"
-    },
-    "creator": {
-      "description": "An entity primarily responsible for making the resource. Examples of a Creator include a person, an organization, or a service. Typically, the name of a Creator should be used to indicate the entity.",
-      "additionalProperties": false,
-      "required": [
-        "name"
-      ],
-      "properties": {
-        "email": {
-          "format": "email",
-          "description": "Contact email for the purpose of this specific record.",
-          "type": "string"
-        },
-        "contribution": {
-          "description": "Specific contribution of the person to this specific record.",
-          "type": "string"
-        },
-        "affiliations": {
-          "items": {
-            "type": "string"
-          },
-          "uniqueItems": true,
-          "description": "Affiliation(s) for the purpose of this specific record.",
-          "type": "array"
-        },
-        "name": {
-          "description": "Full name of person. Personal name format: family, given.",
-          "type": "string"
-        },
-        "ids": {
-          "items": {
-            "additionalProperties": false,
-            "properties": {
-              "source": {
-                "type": "string"
-              },
-              "value": {
-                "type": "string"
-              }
-            },
-            "type": "object"
-          },
-          "uniqueItems": true,
-          "description": "List of IDs related with the person.",
-          "type": "array"
-        }
-      },
-      "type": "object"
-    },
-    "copyright": {
-      "properties": {
-        "year": {
-          "format": "date-time",
-          "description": "The year during which the claimed copyright for the CreativeWork was first asserted.",
-          "type": "string"
-        },
-        "holder": {
-          "description": "The party holding the legal copyright to the record.",
-          "type": "string"
-        },
-        "url": {
-          "format": "url",
-          "type": "string"
-        }
-      },
-      "type": "object"
-    },
-    "description": {
-      "description": "An account of the resource. Description may include but is not limited to: an abstract, a table of contents, a graphical representation, or a free-text account of the resource.",
-      "additionalProperties": false,
-      "required": [
-        "value"
-      ],
-      "properties": {
-        "source": {
-          "type": "string"
-        },
-        "value": {
-          "type": "string"
-        }
-      },
-      "type": "object"
-    },
-    "keywords": {
-      "items": {
-        "type": "object"
-      },
-      "type": "array"
-    },
-    "identifier": {
-      "additionalProperties": false,
-      "description": "An unambiguous reference to the resource within a given context.",
-      "properties": {
-        "source": {
-          "type": "string"
-        },
-        "value": {
-          "type": "string"
-        },
-        "type": {
-          "type": "string"
-        }
-      },
-      "type": "object"
-    },
-    "license": {
-        "items": {
-            "additionalProperties": false,
-            "properties": {
-                "license": {
-                    "title": "License name",
-                    "type": "string"
-                },
-                "material": {
-                    "title": "Material",
-                    "type": "string"
-                },
-                "url": {
-                    "format": "url",
-                    "title": "URL of the license",
-                    "type": "string"
-                }
-            },
-            "title": "License",
-            "type": "object"
-        },
-        "title": "License information",
-        "type": "array",
-        "uniqueItems": true
-    },
-    "date": {
-      "format": "date-time",
-      "description": "A point or period of time associated with an event in the lifecycle of the resource. (http://www.w3.org/TR/NOTE-datetime)",
-      "type": "string"
-    },
-    "contributor": {
-      "description": "An entity responsible for making contributions to the resource. Examples of a Contributor include a person, an organization, or a service. Typically, the name of a Contributor should be used to indicate the entity.",
-      "additionalProperties": false,
-      "required": [
-        "name"
-      ],
-      "properties": {
-        "email": {
-          "format": "email",
-          "description": "Contact email for the purpose of this specific record.",
-          "type": "string"
-        },
-        "role": {
-          "type": "string"
-        },
-        "name": {
-          "description": "Full name of person. Personal name format: family, given.",
-          "type": "string"
-        },
-        "contribution": {
-          "description": "Specific contribution of the person to this specific record.",
-          "type": "string"
-        },
-        "affiliations": {
-          "items": {
-            "type": "string"
-          },
-          "uniqueItems": true,
-          "description": "Affiliation(s) for the purpose of this specific record.",
-          "type": "array"
-        },
-        "ids": {
-          "items": {
-            "additionalProperties": false,
-            "properties": {
-              "source": {
-                "type": "string"
-              },
-              "value": {
-                "type": "string"
-              }
-            },
-            "type": "object"
-          },
-          "uniqueItems": true,
-          "description": "List of IDs related with the person.",
-          "type": "array"
-        }
-      },
-      "type": "object"
-    },
-    "file": {
-      "description": "A file object described using some basic subfields. (Usually to be extended).",
-      "properties": {
-        "key": {
-          "type": "string"
-        },
-        "checksum": {
-          "type": "string"
-        },
-        "category": {
-          "description": "Former BibDocFile.doctype.",
-          "type": "string"
-        },
-        "bucket": {
-          "type": "string"
-        },
-        "size": {
-          "type": "integer"
-        },
-        "type": {
-          "description": "File type extension.",
-          "type": "string"
-        },
-        "version_id": {
-          "type": "string"
-        }
-      },
-      "type": "object"
-    }
-  },
   "properties": {
     "report_number": {
       "type": "object",
diff --git a/cds_dojson/schemas/deposits/records/videos/video/video-v1.0.0.json b/cds_dojson/schemas/deposits/records/videos/video/video-v1.0.0.json
index 84469a29..e93ddbc6 100644
--- a/cds_dojson/schemas/deposits/records/videos/video/video-v1.0.0.json
+++ b/cds_dojson/schemas/deposits/records/videos/video/video-v1.0.0.json
@@ -3,287 +3,6 @@
   "$schema": "http://json-schema.org/draft-04/schema#",
   "type": "object",
   "additionalProperties": false,
-  "definitions": {
-    "identifier": {
-      "additionalProperties": false,
-      "type": "object",
-      "properties": {
-        "type": {
-          "type": "string"
-        },
-        "source": {
-          "type": "string"
-        },
-        "value": {
-          "type": "string"
-        }
-      },
-      "description": "An unambiguous reference to the resource within a given context."
-    },
-    "license": {
-      "items": {
-        "additionalProperties": false,
-        "properties": {
-          "license": {
-            "title": "License name",
-            "type": "string"
-          },
-          "material": {
-            "title": "License name",
-            "type": "string"
-          },
-          "url": {
-            "format": "url",
-            "title": "URL of the license",
-            "type": "string"
-          }
-        },
-        "title": "License",
-        "type": "object"
-      },
-      "title": "License information",
-      "type": "array",
-      "uniqueItems": true
-    },
-    "related_links": {
-      "items": {
-        "additionalProperties": false,
-        "properties": {
-          "name": {
-            "title": "Related link name",
-            "type": "string"
-          },
-          "url": {
-            "format": "url",
-            "title": "Related URL",
-            "type": "string"
-          }
-        },
-        "title": "Related links",
-        "type": "object"
-      },
-      "title": "Related links information",
-      "type": "array",
-      "uniqueItems": true
-    },
-    "file": {
-      "type": "object",
-      "properties": {
-        "size": {
-          "type": "integer"
-        },
-        "key": {
-          "type": "string"
-        },
-        "checksum": {
-          "type": "string"
-        },
-        "category": {
-          "type": "string",
-          "description": "Former BibDocFile.doctype."
-        },
-        "type": {
-          "type": "string",
-          "description": "File type extension."
-        },
-        "bucket": {
-          "type": "string"
-        },
-        "version_id": {
-          "type": "string"
-        }
-      },
-      "description": "A file object described using some basic subfields. (Usually to be extended)."
-    },
-    "creator": {
-      "additionalProperties": false,
-      "type": "object",
-      "properties": {
-        "contribution": {
-          "type": "string",
-          "description": "Specific contribution of the person to this specific record."
-        },
-        "email": {
-          "format": "email",
-          "type": "string",
-          "description": "Contact email for the purpose of this specific record."
-        },
-        "name": {
-          "type": "string",
-          "description": "Full name of person. Personal name format: family, given."
-        },
-        "affiliations": {
-          "type": "array",
-          "uniqueItems": true,
-          "description": "Affiliation(s) for the purpose of this specific record.",
-          "items": {
-            "type": "string"
-          }
-        },
-        "ids": {
-          "type": "array",
-          "uniqueItems": true,
-          "description": "List of IDs related with the person.",
-          "items": {
-            "additionalProperties": false,
-            "type": "object",
-            "properties": {
-              "source": {
-                "type": "string"
-              },
-              "value": {
-                "type": "string"
-              }
-            }
-          }
-        }
-      },
-      "description": "An entity primarily responsible for making the resource. Examples of a Creator include a person, an organization, or a service. Typically, the name of a Creator should be used to indicate the entity.",
-      "required": [
-        "name"
-      ]
-    },
-    "description": {
-      "additionalProperties": false,
-      "type": "object",
-      "properties": {
-        "source": {
-          "type": "string"
-        },
-        "value": {
-          "type": "string"
-        }
-      },
-      "description": "An account of the resource. Description may include but is not limited to: an abstract, a table of contents, a graphical representation, or a free-text account of the resource.",
-      "required": [
-        "value"
-      ]
-    },
-    "copyright": {
-      "type": "object",
-      "properties": {
-        "url": {
-          "format": "url",
-          "type": "string"
-        },
-        "year": {
-          "format": "date-time",
-          "type": "string",
-          "description": "The year during which the claimed copyright for the CreativeWork was first asserted."
-        },
-        "holder": {
-          "type": "string",
-          "description": "The party holding the legal copyright to the record."
-        }
-      }
-    },
-    "keywords": {
-      "items": {
-        "type": "object"
-      },
-      "type": "array"
-    },
-    "title": {
-      "additionalProperties": false,
-      "type": "object",
-      "properties": {
-        "title": {
-          "type": "string"
-        },
-        "subtitle": {
-          "type": "string"
-        },
-        "source": {
-          "type": "string"
-        }
-      },
-      "description": "A name given to the resource. Typically, a Title will be a name by which the resource is formally known.",
-      "required": [
-        "title"
-      ]
-    },
-    "date": {
-      "format": "date-time",
-      "type": "string",
-      "description": "A point or period of time associated with an event in the lifecycle of the resource. (http://www.w3.org/TR/NOTE-datetime)"
-    },
-    "contributor": {
-      "additionalProperties": false,
-      "type": "object",
-      "properties": {
-        "contribution": {
-          "type": "string",
-          "description": "Specific contribution of the person to this specific record."
-        },
-        "name": {
-          "type": "string",
-          "description": "Full name of person. Personal name format: family, given."
-        },
-        "role": {
-          "type": "string"
-        },
-        "email": {
-          "format": "email",
-          "type": "string",
-          "description": "Contact email for the purpose of this specific record."
-        },
-        "ids": {
-          "type": "array",
-          "uniqueItems": true,
-          "description": "List of IDs related with the person.",
-          "items": {
-            "additionalProperties": false,
-            "type": "object",
-            "properties": {
-              "source": {
-                "type": "string"
-              },
-              "value": {
-                "type": "string"
-              }
-            }
-          }
-        },
-        "affiliations": {
-          "type": "array",
-          "uniqueItems": true,
-          "description": "Affiliation(s) for the purpose of this specific record.",
-          "items": {
-            "type": "string"
-          }
-        }
-      },
-      "description": "An entity responsible for making contributions to the resource. Examples of a Contributor include a person, an organization, or a service. Typically, the name of a Contributor should be used to indicate the entity.",
-      "required": [
-        "name"
-      ]
-    },
-    "language": {
-      "description": "A language of the resource.",
-      "enum": [
-        "bg",
-        "ca",
-        "de",
-        "el",
-        "en",
-        "es",
-        "fr",
-        "hr",
-        "it",
-        "ja",
-        "ka",
-        "no",
-        "pl",
-        "pt",
-        "ru",
-        "sk",
-        "sv",
-        "zh_CN",
-        "zh_TW"
-      ],
-      "type": "string"
-    }
-  },
   "properties": {
     "vr": {
       "type": "boolean"
diff --git a/cds_dojson/schemas/records/base-v1.0.0.json b/cds_dojson/schemas/records/base-v1.0.0.json
index e10044ad..717c5f36 100644
--- a/cds_dojson/schemas/records/base-v1.0.0.json
+++ b/cds_dojson/schemas/records/base-v1.0.0.json
@@ -2,285 +2,6 @@
   "title": "CDS Base Record Schema v1.0.0",
   "$schema": "http://json-schema.org/draft-04/schema#",
   "type": "object",
-  "definitions": {
-    "creator": {
-      "description": "An entity primarily responsible for making the resource. Examples of a Creator include a person, an organization, or a service. Typically, the name of a Creator should be used to indicate the entity.",
-      "type": "object",
-      "additionalProperties": false,
-      "properties": {
-        "affiliations": {
-          "description": "Affiliation(s) for the purpose of this specific record.",
-          "type": "array",
-          "uniqueItems": true,
-          "items": {
-            "type": "string"
-          }
-        },
-        "name": {
-          "description": "Full name of person. Personal name format: family, given.",
-          "type": "string"
-        },
-        "email": {
-          "description": "Contact email for the purpose of this specific record.",
-          "type": "string",
-          "format": "email"
-        },
-        "ids": {
-          "description": "List of IDs related with the person.",
-          "type": "array",
-          "uniqueItems": true,
-          "items": {
-            "type": "object",
-            "additionalProperties": false,
-            "properties": {
-              "value": {
-                "type": "string"
-              },
-              "source": {
-                "type": "string"
-              }
-            }
-          }
-        },
-        "contribution": {
-          "description": "Specific contribution of the person to this specific record.",
-          "type": "string"
-        }
-      },
-      "required": ["name"]
-    },
-    "contributor": {
-      "description": "An entity responsible for making contributions to the resource. Examples of a Contributor include a person, an organization, or a service. Typically, the name of a Contributor should be used to indicate the entity.",
-      "type": "object",
-      "additionalProperties": false,
-      "properties": {
-        "affiliations": {
-          "description": "Affiliation(s) for the purpose of this specific record.",
-          "type": "array",
-          "uniqueItems": true,
-          "items": {
-            "type": "string"
-          }
-        },
-        "name": {
-          "description": "Full name of person. Personal name format: family, given.",
-          "type": "string"
-        },
-        "email": {
-          "description": "Contact email for the purpose of this specific record.",
-          "type": "string",
-          "format": "email"
-        },
-        "ids": {
-          "description": "List of IDs related with the person.",
-          "type": "array",
-          "uniqueItems": true,
-          "items": {
-            "type": "object",
-            "additionalProperties": false,
-            "properties": {
-              "value": {
-                "type": "string"
-              },
-              "source": {
-                "type": "string"
-              }
-            }
-          }
-        },
-        "contribution": {
-          "description": "Specific contribution of the person to this specific record.",
-          "type": "string"
-        },
-        "role" : {
-          "type": "string"
-        }
-      },
-      "required": ["name"]
-    },
-    "description": {
-      "description": "An account of the resource. Description may include but is not limited to: an abstract, a table of contents, a graphical representation, or a free-text account of the resource.",
-      "type": "object",
-      "additionalProperties": false,
-      "properties": {
-        "source": {
-          "type": "string"
-        },
-        "value": {
-          "type": "string"
-        }
-      },
-      "required": ["value"]
-    },
-    "keywords": {
-      "items": {
-        "type": "object"
-      },
-      "type": "array"
-    },
-    "title": {
-      "description": "A name given to the resource. Typically, a Title will be a name by which the resource is formally known.",
-      "type": "object",
-      "additionalProperties": false,
-      "properties": {
-        "source": {
-          "type": "string"
-        },
-        "title": {
-          "type": "string"
-        },
-        "subtitle": {
-          "type": "string"
-        }
-      },
-      "required": ["title"]
-    },
-    "identifier": {
-      "description": "An unambiguous reference to the resource within a given context.",
-      "type": "object",
-      "additionalProperties": false,
-      "properties": {
-        "source": {
-          "type": "string"
-        },
-        "type": {
-          "type": "string"
-        },
-        "value": {
-          "type": "string"
-        }
-      }
-    },
-    "language": {
-      "description": "A language of the resource.",
-      "enum": [
-        "bg",
-        "ca",
-        "de",
-        "el",
-        "en",
-        "es",
-        "fr",
-        "hr",
-        "it",
-        "ja",
-        "ka",
-        "no",
-        "pl",
-        "pt",
-        "ru",
-        "sk",
-        "sv",
-        "zh_CN",
-        "zh_TW"
-      ],
-      "type": "string"
-    },
-    "copyright": {
-      "type": "object",
-      "properties": {
-        "holder": {
-          "description": "The party holding the legal copyright to the record.",
-          "type": "string"
-        },
-        "year": {
-          "description": "The year during which the claimed copyright for the CreativeWork was first asserted.",
-          "type": "string",
-          "format" : "date-time"
-        },
-        "url": {
-          "type": "string",
-          "format": "url"
-        }
-      }
-    },
-    "license": {
-      "items": {
-        "additionalProperties": false,
-        "properties": {
-          "license": {
-            "title": "License name",
-            "type": "string"
-          },
-          "material": {
-            "title": "Material",
-            "type": "string"
-          },
-          "url": {
-            "format": "url",
-            "title": "URL of the license",
-            "type": "string"
-          }
-        },
-        "title": "License",
-        "type": "object"
-      },
-      "title": "License information",
-      "type": "array",
-      "uniqueItems": true
-    },
-    "date": {
-      "description": "A point or period of time associated with an event in the lifecycle of the resource. (http://www.w3.org/TR/NOTE-datetime)",
-      "type": "string",
-      "format": "date-time"
-    },
-    "file": {
-      "description": "A file object described using some basic subfields. (Usually to be extended).",
-      "type": "object",
-      "properties": {
-        "bucket": {
-          "type": "string"
-        },
-        "checksum": {
-          "type": "string"
-        },
-        "key": {
-          "type": "string"
-        },
-        "size": {
-          "type": "integer"
-        },
-        "type": {
-          "description": "File type extension.",
-          "type": "string"
-        },
-        "category": {
-          "description": "Former BibDocFile.doctype.",
-          "type": "string"
-        },
-        "version_id": {
-          "type": "string"
-        }
-      }
-    },
-    "publication_date": {
-      "title": "Publication date",
-      "description": "When the record is published",
-      "type": "string",
-      "format" : "date-time"
-    },
-    "related_links": {
-      "items": {
-        "additionalProperties": false,
-        "properties": {
-          "name": {
-            "title": "Related link name",
-            "type": "string"
-          },
-          "url": {
-            "format": "url",
-            "title": "Related URL",
-            "type": "string"
-          }
-        },
-        "title": "Related links",
-        "type": "object"
-      },
-      "title": "Related links information",
-      "type": "array",
-      "uniqueItems": true
-    }
-  },
   "properties": {
     "report_number": {
       "type": "object",
diff --git a/cds_dojson/schemas/records/definitions-v1.0.0.json b/cds_dojson/schemas/records/definitions-v1.0.0.json
new file mode 100644
index 00000000..03aee181
--- /dev/null
+++ b/cds_dojson/schemas/records/definitions-v1.0.0.json
@@ -0,0 +1,284 @@
+{
+  "title": "CDS Base Record Definitions v1.0.0",
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "type": "object",
+  "definitions": {
+    "creator": {
+      "description": "An entity primarily responsible for making the resource. Examples of a Creator include a person, an organization, or a service. Typically, the name of a Creator should be used to indicate the entity.",
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "affiliations": {
+          "description": "Affiliation(s) for the purpose of this specific record.",
+          "type": "array",
+          "uniqueItems": true,
+          "items": {
+            "type": "string"
+          }
+        },
+        "name": {
+          "description": "Full name of person. Personal name format: family, given.",
+          "type": "string"
+        },
+        "email": {
+          "description": "Contact email for the purpose of this specific record.",
+          "type": "string",
+          "format": "email"
+        },
+        "ids": {
+          "description": "List of IDs related with the person.",
+          "type": "array",
+          "uniqueItems": true,
+          "items": {
+            "type": "object",
+            "additionalProperties": false,
+            "properties": {
+              "value": {
+                "type": "string"
+              },
+              "source": {
+                "type": "string"
+              }
+            }
+          }
+        },
+        "contribution": {
+          "description": "Specific contribution of the person to this specific record.",
+          "type": "string"
+        }
+      },
+      "required": ["name"]
+    },
+    "contributor": {
+      "description": "An entity responsible for making contributions to the resource. Examples of a Contributor include a person, an organization, or a service. Typically, the name of a Contributor should be used to indicate the entity.",
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "affiliations": {
+          "description": "Affiliation(s) for the purpose of this specific record.",
+          "type": "array",
+          "uniqueItems": true,
+          "items": {
+            "type": "string"
+          }
+        },
+        "name": {
+          "description": "Full name of person. Personal name format: family, given.",
+          "type": "string"
+        },
+        "email": {
+          "description": "Contact email for the purpose of this specific record.",
+          "type": "string",
+          "format": "email"
+        },
+        "ids": {
+          "description": "List of IDs related with the person.",
+          "type": "array",
+          "uniqueItems": true,
+          "items": {
+            "type": "object",
+            "additionalProperties": false,
+            "properties": {
+              "value": {
+                "type": "string"
+              },
+              "source": {
+                "type": "string"
+              }
+            }
+          }
+        },
+        "contribution": {
+          "description": "Specific contribution of the person to this specific record.",
+          "type": "string"
+        },
+        "role" : {
+          "type": "string"
+        }
+      },
+      "required": ["name"]
+    },
+    "description": {
+      "description": "An account of the resource. Description may include but is not limited to: an abstract, a table of contents, a graphical representation, or a free-text account of the resource.",
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "source": {
+          "type": "string"
+        },
+        "value": {
+          "type": "string"
+        }
+      },
+      "required": ["value"]
+    },
+    "keywords": {
+      "items": {
+        "type": "object"
+      },
+      "type": "array"
+    },
+    "title": {
+      "description": "A name given to the resource. Typically, a Title will be a name by which the resource is formally known.",
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "source": {
+          "type": "string"
+        },
+        "title": {
+          "type": "string"
+        },
+        "subtitle": {
+          "type": "string"
+        }
+      },
+      "required": ["title"]
+    },
+    "identifier": {
+      "description": "An unambiguous reference to the resource within a given context.",
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "source": {
+          "type": "string"
+        },
+        "type": {
+          "type": "string"
+        },
+        "value": {
+          "type": "string"
+        }
+      }
+    },
+    "language": {
+      "description": "A language of the resource.",
+      "enum": [
+        "bg",
+        "ca",
+        "de",
+        "el",
+        "en",
+        "es",
+        "fr",
+        "hr",
+        "it",
+        "ja",
+        "ka",
+        "no",
+        "pl",
+        "pt",
+        "ru",
+        "sk",
+        "sv",
+        "zh_CN",
+        "zh_TW"
+      ],
+      "type": "string"
+    },
+    "copyright": {
+      "type": "object",
+      "properties": {
+        "holder": {
+          "description": "The party holding the legal copyright to the record.",
+          "type": "string"
+        },
+        "year": {
+          "description": "The year during which the claimed copyright for the CreativeWork was first asserted.",
+          "type": "string",
+          "format" : "date-time"
+        },
+        "url": {
+          "type": "string",
+          "format": "url"
+        }
+      }
+    },
+    "license": {
+      "items": {
+        "additionalProperties": false,
+        "properties": {
+          "license": {
+            "title": "License name",
+            "type": "string"
+          },
+          "material": {
+            "title": "Material",
+            "type": "string"
+          },
+          "url": {
+            "format": "url",
+            "title": "URL of the license",
+            "type": "string"
+          }
+        },
+        "title": "License",
+        "type": "object"
+      },
+      "title": "License information",
+      "type": "array",
+      "uniqueItems": true
+    },
+    "date": {
+      "description": "A point or period of time associated with an event in the lifecycle of the resource. (http://www.w3.org/TR/NOTE-datetime)",
+      "type": "string",
+      "format": "date-time"
+    },
+    "file": {
+      "description": "A file object described using some basic subfields. (Usually to be extended).",
+      "type": "object",
+      "properties": {
+        "bucket": {
+          "type": "string"
+        },
+        "checksum": {
+          "type": "string"
+        },
+        "key": {
+          "type": "string"
+        },
+        "size": {
+          "type": "integer"
+        },
+        "type": {
+          "description": "File type extension.",
+          "type": "string"
+        },
+        "category": {
+          "description": "Former BibDocFile.doctype.",
+          "type": "string"
+        },
+        "version_id": {
+          "type": "string"
+        }
+      }
+    },
+    "publication_date": {
+      "title": "Publication date",
+      "description": "When the record is published",
+      "type": "string",
+      "format" : "date-time"
+    },
+    "related_links": {
+      "items": {
+        "additionalProperties": false,
+        "properties": {
+          "name": {
+            "title": "Related link name",
+            "type": "string"
+          },
+          "url": {
+            "format": "url",
+            "title": "Related URL",
+            "type": "string"
+          }
+        },
+        "title": "Related links",
+        "type": "object"
+      },
+      "title": "Related links information",
+      "type": "array",
+      "uniqueItems": true
+    }
+  }
+}
diff --git a/cds_dojson/schemas/records/videos/project/project-v1.0.0.json b/cds_dojson/schemas/records/videos/project/project-v1.0.0.json
index 4b7d38d7..4791f425 100644
--- a/cds_dojson/schemas/records/videos/project/project-v1.0.0.json
+++ b/cds_dojson/schemas/records/videos/project/project-v1.0.0.json
@@ -2,293 +2,6 @@
   "title": "CDS Base Record Schema v1.0.0",
   "$schema": "http://json-schema.org/draft-04/schema#",
   "type": "object",
-  "definitions": {
-    "creator": {
-      "properties": {
-        "name": {
-          "description": "Full name of person. Personal name format: family, given.",
-          "type": "string"
-        },
-        "ids": {
-          "description": "List of IDs related with the person.",
-          "items": {
-            "properties": {
-              "source": {
-                "type": "string"
-              },
-              "value": {
-                "type": "string"
-              }
-            },
-            "type": "object",
-            "additionalProperties": false
-          },
-          "type": "array",
-          "uniqueItems": true
-        },
-        "affiliations": {
-          "description": "Affiliation(s) for the purpose of this specific record.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array",
-          "uniqueItems": true
-        },
-        "contribution": {
-          "description": "Specific contribution of the person to this specific record.",
-          "type": "string"
-        },
-        "email": {
-          "description": "Contact email for the purpose of this specific record.",
-          "type": "string",
-          "format": "email"
-        }
-      },
-      "description": "An entity primarily responsible for making the resource. Examples of a Creator include a person, an organization, or a service. Typically, the name of a Creator should be used to indicate the entity.",
-      "type": "object",
-      "additionalProperties": false,
-      "required": [
-        "name"
-      ]
-    },
-    "identifier": {
-      "properties": {
-        "source": {
-          "type": "string"
-        },
-        "type": {
-          "type": "string"
-        },
-        "value": {
-          "type": "string"
-        }
-      },
-      "description": "An unambiguous reference to the resource within a given context.",
-      "type": "object",
-      "additionalProperties": false
-    },
-    "keywords": {
-      "items": {
-        "type": "object"
-      },
-      "type": "array"
-    },
-    "contributor": {
-      "properties": {
-        "ids": {
-          "description": "List of IDs related with the person.",
-          "items": {
-            "properties": {
-              "source": {
-                "type": "string"
-              },
-              "value": {
-                "type": "string"
-              }
-            },
-            "type": "object",
-            "additionalProperties": false
-          },
-          "type": "array",
-          "uniqueItems": true
-        },
-        "affiliations": {
-          "description": "Affiliation(s) for the purpose of this specific record.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array",
-          "uniqueItems": true
-        },
-        "contribution": {
-          "description": "Specific contribution of the person to this specific record.",
-          "type": "string"
-        },
-        "email": {
-          "description": "Contact email for the purpose of this specific record.",
-          "type": "string",
-          "format": "email"
-        },
-        "name": {
-          "description": "Full name of person. Personal name format: family, given.",
-          "type": "string"
-        },
-        "role": {
-          "type": "string"
-        }
-      },
-      "description": "An entity responsible for making contributions to the resource. Examples of a Contributor include a person, an organization, or a service. Typically, the name of a Contributor should be used to indicate the entity.",
-      "type": "object",
-      "additionalProperties": false,
-      "required": [
-        "name"
-      ]
-    },
-    "title": {
-      "properties": {
-        "source": {
-          "type": "string"
-        },
-        "title": {
-          "type": "string"
-        },
-        "subtitle": {
-          "type": "string"
-        }
-      },
-      "description": "A name given to the resource. Typically, a Title will be a name by which the resource is formally known.",
-      "type": "object",
-      "additionalProperties": false,
-      "required": [
-        "title"
-      ]
-    },
-    "license": {
-      "items": {
-        "additionalProperties": false,
-        "properties": {
-          "license": {
-            "title": "License name",
-            "type": "string"
-          },
-          "material": {
-            "title": "Material",
-            "type": "string"
-          },
-          "url": {
-            "format": "url",
-            "title": "URL of the license",
-            "type": "string"
-          }
-        },
-        "title": "License",
-        "type": "object"
-      },
-      "title": "License information",
-      "type": "array",
-      "uniqueItems": true
-    },
-    "related_links": {
-      "items": {
-        "additionalProperties": false,
-        "properties": {
-          "name": {
-            "title": "Related link name",
-            "type": "string"
-          },
-          "url": {
-            "format": "url",
-            "title": "Related URL",
-            "type": "string"
-          }
-        },
-        "title": "Related links",
-        "type": "object"
-      },
-      "title": "Related links information",
-      "type": "array",
-      "uniqueItems": true
-    },
-    "file": {
-      "properties": {
-        "category": {
-          "description": "Former BibDocFile.doctype.",
-          "type": "string"
-        },
-        "checksum": {
-          "type": "string"
-        },
-        "key": {
-          "type": "string"
-        },
-        "size": {
-          "type": "integer"
-        },
-        "bucket": {
-          "type": "string"
-        },
-        "type": {
-          "description": "File type extension.",
-          "type": "string"
-        },
-        "version_id": {
-          "type": "string"
-        }
-      },
-      "description": "A file object described using some basic subfields. (Usually to be extended).",
-      "type": "object"
-    },
-    "date": {
-      "description": "A point or period of time associated with an event in the lifecycle of the resource. (http://www.w3.org/TR/NOTE-datetime)",
-      "type": "string",
-      "format": "date-time"
-    },
-    "description": {
-      "properties": {
-        "source": {
-          "type": "string"
-        },
-        "value": {
-          "type": "string"
-        }
-      },
-      "description": "An account of the resource. Description may include but is not limited to: an abstract, a table of contents, a graphical representation, or a free-text account of the resource.",
-      "type": "object",
-      "additionalProperties": false,
-      "required": [
-        "value"
-      ]
-    },
-    "copyright": {
-      "properties": {
-        "holder": {
-          "description": "The party holding the legal copyright to the record.",
-          "type": "string"
-        },
-        "year": {
-          "description": "The year during which the claimed copyright for the CreativeWork was first asserted.",
-          "type": "string",
-          "format": "date-time"
-        },
-        "url": {
-          "type": "string",
-          "format": "url"
-        }
-      },
-      "type": "object"
-    },
-    "language": {
-      "description": "A language of the resource.",
-      "enum": [
-        "bg",
-        "ca",
-        "de",
-        "el",
-        "en",
-        "es",
-        "fr",
-        "hr",
-        "it",
-        "ja",
-        "ka",
-        "no",
-        "pl",
-        "pt",
-        "ru",
-        "sk",
-        "sv",
-        "zh_CN",
-        "zh_TW"
-      ],
-      "type": "string"
-    },
-    "publication_date": {
-      "title": "Publication date",
-      "description": "When the record is published",
-      "type": "string",
-      "format" : "date-time"
-    }
-  },
   "properties": {
     "keywords": {
       "items": {
diff --git a/cds_dojson/schemas/records/videos/project/project_src-v1.0.0.json b/cds_dojson/schemas/records/videos/project/project_src-v1.0.0.json
index 6ded2029..48418f7e 100644
--- a/cds_dojson/schemas/records/videos/project/project_src-v1.0.0.json
+++ b/cds_dojson/schemas/records/videos/project/project_src-v1.0.0.json
@@ -4,9 +4,9 @@
     { "$ref": "../../base-v1.0.0.json" },
     {
       "properties": {
-        "title": { "$ref": "../../base-v1.0.0.json#/definitions/title" },
-        "keywords": { "$ref": "../../base-v1.0.0.json#/definitions/keywords" },
-        "description": { "$ref": "../../base-v1.0.0.json#/definitions/description" },
+        "title": { "$ref": "../../definitions-v1.0.0.json#/definitions/title" },
+        "keywords": { "$ref": "../../definitions-v1.0.0.json#/definitions/keywords" },
+        "description": { "$ref": "../../definitions-v1.0.0.json#/definitions/description" },
         "translations": {
           "type": "array",
           "items": {
@@ -15,25 +15,25 @@
               {
                 "properties": {
                   "title": {
-                    "$ref": "../../base-v1.0.0.json#/definitions/title"
+                    "$ref": "../../definitions-v1.0.0.json#/definitions/title"
                   },
                   "description": {
-                    "$ref": "../../base-v1.0.0.json#/definitions/description"
+                    "$ref": "../../definitions-v1.0.0.json#/definitions/description"
                   },
                   "language": {
-                    "$ref": "../../base-v1.0.0.json#/definitions/language"
+                    "$ref": "../../definitions-v1.0.0.json#/definitions/language"
                   }
                 }
               }
             ]
           }
         },
-        "creator": { "$ref": "../../base-v1.0.0.json#/definitions/creator" },
+        "creator": { "$ref": "../../definitions-v1.0.0.json#/definitions/creator" },
         "contributors": {
           "type": "array",
           "items": {
             "allOf": [
-              {"$ref": "../../base-v1.0.0.json#/definitions/contributor"},
+              {"$ref": "../../definitions-v1.0.0.json#/definitions/contributor"},
               {
                 "properties": {
                   "role": {
@@ -54,12 +54,12 @@
             ]
           }
         },
-        "date": { "$ref": "../../base-v1.0.0.json#/definitions/date" },
-        "license": { "$ref": "../../base-v1.0.0.json#/definitions/license" },
+        "date": { "$ref": "../../definitions-v1.0.0.json#/definitions/date" },
+        "license": { "$ref": "../../definitions-v1.0.0.json#/definitions/license" },
         "_files": {
             "type": "array",
             "items": {
-              "$ref": "../../base-v1.0.0.json#/definitions/file"
+              "$ref": "../../definitions-v1.0.0.json#/definitions/file"
             }
         },
         "videos": {
diff --git a/cds_dojson/schemas/records/videos/video/video-v1.0.0.json b/cds_dojson/schemas/records/videos/video/video-v1.0.0.json
index d71cabe8..c8264d59 100644
--- a/cds_dojson/schemas/records/videos/video/video-v1.0.0.json
+++ b/cds_dojson/schemas/records/videos/video/video-v1.0.0.json
@@ -2,293 +2,6 @@
   "title": "CDS Base Record Schema v1.0.0",
   "$schema": "http://json-schema.org/draft-04/schema#",
   "type": "object",
-  "definitions": {
-    "description": {
-      "type": "object",
-      "properties": {
-        "source": {
-          "type": "string"
-        },
-        "value": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "value"
-      ],
-      "additionalProperties": false,
-      "description": "An account of the resource. Description may include but is not limited to: an abstract, a table of contents, a graphical representation, or a free-text account of the resource."
-    },
-    "title": {
-      "type": "object",
-      "properties": {
-        "subtitle": {
-          "type": "string"
-        },
-        "source": {
-          "type": "string"
-        },
-        "title": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "title"
-      ],
-      "additionalProperties": false,
-      "description": "A name given to the resource. Typically, a Title will be a name by which the resource is formally known."
-    },
-    "file": {
-      "type": "object",
-      "properties": {
-        "version_id": {
-          "type": "string"
-        },
-        "type": {
-          "type": "string",
-          "description": "File type extension."
-        },
-        "bucket": {
-          "type": "string"
-        },
-        "key": {
-          "type": "string"
-        },
-        "size": {
-          "type": "integer"
-        },
-        "checksum": {
-          "type": "string"
-        },
-        "category": {
-          "type": "string",
-          "description": "Former BibDocFile.doctype."
-        }
-      },
-      "description": "A file object described using some basic subfields. (Usually to be extended)."
-    },
-    "contributor": {
-      "type": "object",
-      "properties": {
-        "ids": {
-          "items": {
-            "type": "object",
-            "properties": {
-              "value": {
-                "type": "string"
-              },
-              "source": {
-                "type": "string"
-              }
-            },
-            "additionalProperties": false
-          },
-          "uniqueItems": true,
-          "type": "array",
-          "description": "List of IDs related with the person."
-        },
-        "contribution": {
-          "type": "string",
-          "description": "Specific contribution of the person to this specific record."
-        },
-        "affiliations": {
-          "items": {
-            "type": "string"
-          },
-          "uniqueItems": true,
-          "type": "array",
-          "description": "Affiliation(s) for the purpose of this specific record."
-        },
-        "role": {
-          "type": "string"
-        },
-        "email": {
-          "format": "email",
-          "type": "string",
-          "description": "Contact email for the purpose of this specific record."
-        },
-        "name": {
-          "type": "string",
-          "description": "Full name of person. Personal name format: family, given."
-        }
-      },
-      "required": [
-        "name"
-      ],
-      "additionalProperties": false,
-      "description": "An entity responsible for making contributions to the resource. Examples of a Contributor include a person, an organization, or a service. Typically, the name of a Contributor should be used to indicate the entity."
-    },
-    "license": {
-      "items": {
-        "additionalProperties": false,
-        "properties": {
-          "license": {
-            "title": "License name",
-            "type": "string"
-          },
-          "material": {
-            "title": "Material",
-            "type": "string"
-          },
-          "url": {
-            "format": "url",
-            "title": "URL of the license",
-            "type": "string"
-          }
-        },
-        "title": "License",
-        "type": "object"
-      },
-      "title": "License information",
-      "type": "array",
-      "uniqueItems": true
-    },
-    "related_links": {
-      "items": {
-        "additionalProperties": false,
-        "properties": {
-          "name": {
-            "title": "Related link name",
-            "type": "string"
-          },
-          "url": {
-            "format": "url",
-            "title": "Related URL",
-            "type": "string"
-          }
-        },
-        "title": "Related links",
-        "type": "object"
-      },
-      "title": "Related links information",
-      "type": "array",
-      "uniqueItems": true
-    },
-    "language": {
-      "description": "A language of the resource.",
-      "enum": [
-        "bg",
-        "ca",
-        "de",
-        "el",
-        "en",
-        "es",
-        "fr",
-        "hr",
-        "it",
-        "ja",
-        "ka",
-        "no",
-        "pl",
-        "pt",
-        "ru",
-        "sk",
-        "sv",
-        "zh_CN",
-        "zh_TW"
-      ],
-      "type": "string"
-    },
-    "copyright": {
-      "type": "object",
-      "properties": {
-        "holder": {
-          "type": "string",
-          "description": "The party holding the legal copyright to the record."
-        },
-        "url": {
-          "format": "url",
-          "type": "string"
-        },
-        "year": {
-          "format": "date-time",
-          "type": "string",
-          "description": "The year during which the claimed copyright for the CreativeWork was first asserted."
-        }
-      }
-    },
-    "identifier": {
-      "type": "object",
-      "properties": {
-        "source": {
-          "type": "string"
-        },
-        "type": {
-          "type": "string"
-        },
-        "value": {
-          "type": "string"
-        }
-      },
-      "description": "An unambiguous reference to the resource within a given context.",
-      "additionalProperties": false
-    },
-    "creator": {
-      "type": "object",
-      "properties": {
-        "email": {
-          "format": "email",
-          "type": "string",
-          "description": "Contact email for the purpose of this specific record."
-        },
-        "affiliations": {
-          "items": {
-            "type": "string"
-          },
-          "uniqueItems": true,
-          "type": "array",
-          "description": "Affiliation(s) for the purpose of this specific record."
-        },
-        "contribution": {
-          "type": "string",
-          "description": "Specific contribution of the person to this specific record."
-        },
-        "name": {
-          "type": "string",
-          "description": "Full name of person. Personal name format: family, given."
-        },
-        "ids": {
-          "items": {
-            "type": "object",
-            "properties": {
-              "value": {
-                "type": "string"
-              },
-              "source": {
-                "type": "string"
-              }
-            },
-            "additionalProperties": false
-          },
-          "uniqueItems": true,
-          "type": "array",
-          "description": "List of IDs related with the person."
-        }
-      },
-      "required": [
-        "name"
-      ],
-      "additionalProperties": false,
-      "description": "An entity primarily responsible for making the resource. Examples of a Creator include a person, an organization, or a service. Typically, the name of a Creator should be used to indicate the entity."
-    },
-    "keywords": {
-      "items": {
-        "type": "object"
-      },
-      "type": "array"
-    },
-    "date": {
-      "format": "date-time",
-      "type": "string",
-      "description": "A point or period of time associated with an event in the lifecycle of the resource. (http://www.w3.org/TR/NOTE-datetime)"
-    },
-    "publication_date": {
-      "title": "Publication date",
-      "description": "When the record is published",
-      "type": "string",
-      "format" : "date-time"
-    }
-  },
   "properties": {
     "vr": {
       "type": "boolean"
diff --git a/cds_dojson/schemas/records/videos/video/video_src-v1.0.0.json b/cds_dojson/schemas/records/videos/video/video_src-v1.0.0.json
index 80b33e6b..ea558988 100644
--- a/cds_dojson/schemas/records/videos/video/video_src-v1.0.0.json
+++ b/cds_dojson/schemas/records/videos/video/video_src-v1.0.0.json
@@ -4,9 +4,9 @@
     { "$ref": "../../base-v1.0.0.json" },
     {
       "properties": {
-        "title": { "$ref": "../../base-v1.0.0.json#/definitions/title" },
-        "keywords": { "$ref": "../../base-v1.0.0.json#/definitions/keywords" },
-        "description": { "$ref": "../../base-v1.0.0.json#/definitions/description" },
+        "title": { "$ref": "../../definitions-v1.0.0.json#/definitions/title" },
+        "keywords": { "$ref": "../../definitions-v1.0.0.json#/definitions/keywords" },
+        "description": { "$ref": "../../definitions-v1.0.0.json#/definitions/description" },
         "translations": {
           "type": "array",
           "items": {
@@ -15,25 +15,25 @@
               {
                 "properties": {
                   "title": {
-                    "$ref": "../../base-v1.0.0.json#/definitions/title"
+                    "$ref": "../../definitions-v1.0.0.json#/definitions/title"
                   },
                   "description": {
-                    "$ref": "../../base-v1.0.0.json#/definitions/description"
+                    "$ref": "../../definitions-v1.0.0.json#/definitions/description"
                   },
                   "language": {
-                    "$ref": "../../base-v1.0.0.json#/definitions/language"
+                    "$ref": "../../definitions-v1.0.0.json#/definitions/language"
                   }
                 }
               }
             ]
           }
         },
-        "creator": { "$ref": "../../base-v1.0.0.json#/definitions/creator" },
+        "creator": { "$ref": "../../definitions-v1.0.0.json#/definitions/creator" },
         "contributors": {
           "type": "array",
           "items": {
             "allOf": [
-              {"$ref": "../../base-v1.0.0.json#/definitions/contributor"},
+              {"$ref": "../../definitions-v1.0.0.json#/definitions/contributor"},
               {
                 "properties": {
                   "role": {
@@ -54,10 +54,10 @@
             ]
           }
         },
-        "date": { "$ref": "../../base-v1.0.0.json#/definitions/date" },
-        "copyright": { "$ref": "../../base-v1.0.0.json#/definitions/copyright" },
-        "license": { "$ref": "../../base-v1.0.0.json#/definitions/license" },
-        "related_links": { "$ref": "../../base-v1.0.0.json#/definitions/related_links" },
+        "date": { "$ref": "../../definitions-v1.0.0.json#/definitions/date" },
+        "copyright": { "$ref": "../../definitions-v1.0.0.json#/definitions/copyright" },
+        "license": { "$ref": "../../definitions-v1.0.0.json#/definitions/license" },
+        "related_links": { "$ref": "../../definitions-v1.0.0.json#/definitions/related_links" },
         "vr": {
           "type": "boolean"
         },
@@ -71,7 +71,7 @@
           "type": "array",
           "items":{
             "allOf": [
-              { "$ref": "../../base-v1.0.0.json#/definitions/file" },
+              { "$ref": "../../definitions-v1.0.0.json#/definitions/file" },
               {
                 "properties": {
                   "category": {
@@ -111,7 +111,7 @@
           "description": "Type of the project.",
           "type": "string"
         },
-        "language": { "$ref": "../../base-v1.0.0.json#/definitions/language" }
+        "language": { "$ref": "../../definitions-v1.0.0.json#/definitions/language" }
       },
       "required": [
         "recid",