diff --git a/content/docs/specifications/table-dialect.md b/content/docs/specifications/table-dialect.md
index c7da3015..a54dc16d 100644
--- a/content/docs/specifications/table-dialect.md
+++ b/content/docs/specifications/table-dialect.md
@@ -15,7 +15,7 @@ sidebar:
   </tr>
 </table>
 
-CSV Dialect defines a simple format to describe the various dialects of CSV files in a language agnostic manner. It aims to deal with a reasonably large subset of the features which differ between dialects, such as terminator strings, quoting rules, escape rules and so on
+Table Dialect describes how tabular data is stored in a file. It supports delimited text files like CSV, semi-structured formats like JSON and YAML, and spreadsheets like Microsoft Excel. The specification is designed to be expressible as a single JSON-compatible descriptor.
 
 ## Language
 
@@ -23,51 +23,542 @@ The key words `MUST`, `MUST NOT`, `REQUIRED`, `SHALL`, `SHALL NOT`, `SHOULD`, `S
 
 ## Introduction
 
-CSV Dialect defines a simple format to describe the various dialects of CSV files in a language agnostic manner. It aims to deal with a reasonably large subset of the features which differ between dialects, such as terminator strings, quoting rules, escape rules and so on. The specification has been modeled around the union of the csv modules in Python and Ruby, and the bulk load capabilities of MySQL and PostgresQL.
+Table Dialect defines set of properties that can be used by data producers and data consumers to ensure data interoperability in various tabular data formats such as CSV, JSON, or Excel. The main goal of this specification is to define a common language for defining tabular data dialects. It is not expected that all the properties are supported by all the Data Package implementations. An implementation `MUST` choose the most suitable strategy for communicating to the users if some relevant feature is not supported.
 
-### Excluded
+Table Dialect is useful for programmes which might have to deal with multiple dialects of tabular files, but which can rely on being told out-of-band which dialect will be used in a given input stream. This reduces the need for heuristic inference of dialects, and simplifies the implementation of readers, which must juggle dialect inference, schema inference, unseekable input streams, character encoding issues, and the lazy reading of very large input streams.
 
-CSV Dialect has nothing to do with the names, contents or types of the headers or data within the CSV file, only how it is formatted. However, CSV Dialect does allow the presence or absence of a header to be specified, similarly to [RFC4180](http://www.ietf.org/rfc/rfc4180.txt).
+:::note[Backward Compatibility]
+Table Dialect supersedes [CSV Dialect](https://specs.frictionlessdata.io/csv-dialect/). Except for `caseSensitiveHeader` and `csvddfVersion` which are removed, all CSV Dialect properties are included in Table Dialect and can be used without changes.
+:::
 
-CSV Dialect is also orthogonal to the character encoding used in the CSV file. Note that it is possible for files in CSV format to contain data in more than one encoding.
+## Descriptor
 
-### Usage
+On logical level, Table Dialect descriptor is represented by a data structure. The data structure `MUST` be a JSON-serializable `object` as defined in [RFC 4627](http://www.ietf.org/rfc/rfc4627.txt).
 
-CSV Dialect is useful for programmes which might have to deal with multiple dialects of CSV file, but which can rely on being told out-of-band which dialect will be used in a given input stream. This reduces the need for heuristic inference of CSV dialects, and simplifies the implementation of CSV readers, which must juggle dialect inference, schema inference, unseekable input streams, character encoding issues, and the lazy reading of very large input streams.
+On physical level, Table Dialect descriptor is represented by a file. A data producer `MAY` use any suitable serialization format. A data consumer `MUST` support JSON serialization format and `MAY` support other serialization formats like YAML or TOML.
 
-Some related work can be found in [this comparison of csv dialect support](https://docs.google.com/spreadsheet/ccc?key=0AmU3V2vcPKrIdEhoU1NQSWtoQmJwcUNCelJtdkx2bFE&usp=sharing), this [example of similar JSON format](http://panda.readthedocs.org/en/latest/api.html#data-uploads), and in Python's [PEP 305](http://www.python.org/dev/peps/pep-0305/).
+The above states that JSON is the only serialization format that `MUST` be used for publishing a Table Dialect while other serialization formats can be used in projects or systems internally if supported by corresponding implementations.
+
+This specification does not define any discoverability mechanisms making a serialized Table Dialect be referenced only directly by its URI.
+
+This specification defines a set of standardized properties to be used and allows custom properties to be added. It is `RECOMMENDED` to use `namespace:property` naming convention for custom properties.
+
+## Properties
+
+Table dialect defines individual properties that regulates data producing and consuming for different groups of targeted formats, as well, as general rules that applies for multiple data format groups. Note, that property grouping is only illustrative, if a property is suitable for a format group that is not mentioned in this specification it still can be used as far as the property definition and semantics are respected.
+
+A property `MUST` be ignored if it is no applicable for an arbitrary data format. For example, SQL databases do not have a concept of a header row.
+
+For the sake of simplicity, most of examples are written in the CSV data format. For example, this data file without providing any Table Dialect properties:
+
+```csv
+id,name
+1,apple
+2,organe
+```
+
+`SHOULD` output this data:
+
+```javascript
+{id: 1, name: "apple"}
+{id: 2, name: "orange"}
+```
+
+### General
+
+General properties are format-agnostic. Usually, there are useful for defining dialects for delimiter-based and spreadsheet-based formats like CSV or Excel.
+
+#### `header`
+
+A Table Dialect descriptor `MAY` have the `header` property that `MUST` be boolean with default value `true`. This property indicates whether the file includes a header row. If `true` the first row in the file `MUST` be interpreted as a header row, not data.
+
+For example, this data file:
+
+```csv
+1,apple
+2,orange
+```
+
+With this dialect definition:
+
+```json
+{
+  "header": false
+}
+```
+
+`SHOULD` output this data:
+
+```javascript
+{field1: 1, field2: "apple"}
+{field1: 2, field2: "orange"}
+```
+
+Where `field1` and `field2` names are implementation-specific and used here only for illustrative purpose.
+
+#### `headerRows`
+
+A Table Dialect descriptor `MAY` have the `headerRows` property that `MUST` be an array of positive integers starting from 1 with default value `[1]`. This property specifies the row numbers for the header. It is `RECOMMENDED` to be used for multiline-header files.
+
+For example, this data file:
+
+```csv
+fruit
+id,name
+1,apple
+2,orange
+```
+
+With this dialect definition:
+
+```json
+{
+  "headerRows": [1, 2]
+}
+```
+
+`SHOULD` output this data:
+
+```javascript
+{"fruit id": 1, "fruit name": "apple"}
+{"fruit id": 2, "fruit name": "orange"}
+```
+
+#### `headerJoin`
+
+A Table Dialect descriptor `MAY` have the `headerJoin` property that `MUST` be a string with default value `" "`. This property specifies how multiline-header files have to join the resulting header rows.
+
+For example, this data file:
+
+```csv
+fruit
+id,name
+1,apple
+2,orange
+```
+
+With this dialect definition:
+
+```json
+{
+  "headerRows": [1, 2],
+  "headerJoin": "-"
+}
+```
+
+`SHOULD` output this data:
+
+```javascript
+{"fruit-id": 1, "fruit-name": "apple"}
+{"fruit-id": 2, "fruit-name": "orange"}
+```
+
+#### `commentRows`
+
+A Table Dialect descriptor `MAY` have the `commentRows` property that `MUST` be an array of positive integers starting from 1; undefined by default. This property specifies what rows have to be omitted from the data.
+
+For example, this data file:
+
+```csv
+id,name
+#fruits
+1,apple
+2,orange
+```
+
+With this dialect definition:
+
+```json
+{
+  "commentRows": [2]
+}
+```
+
+`SHOULD` output this data:
+
+```javascript
+{id: 1, name: "apple"}
+{id: 2, name: "orange"}
+```
+
+#### `commentChar`
+
+A Table Dialect descriptor `MAY` have the `commentChar` property that `MUST` be a string of one or more characters; undefined by default. This property specifies what rows have to be omitted from the data based on the row's first characters.
+
+For example, this data file:
+
+```csv
+id,name
+#fruits
+1,apple
+2,orange
+```
+
+With this dialect definition:
+
+```json
+{
+  "commentChar": "#"
+}
+```
+
+`SHOULD` output this data:
+
+```javascript
+{id: 1, name: "apple"}
+{id: 2, name: "orange"}
+```
+
+### Delimited
+
+Delimited formats is a group of textual formats such as CSV and TSV.
+
+#### `delimiter`
+
+A Table Dialect descriptor `MAY` have the `delimiter` property that `MUST` be a string; with default value `,` (comma). This property specifies the character sequence which separates fields in the data file.
+
+For example, this data file:
+
+```csv
+id|name
+1|apple
+2|orange
+```
+
+With this dialect definition:
+
+```json
+{
+  "delimiter": "|"
+}
+```
+
+`SHOULD` output this data:
 
-## Specification
+```javascript
+{id: 1, name: "apple"}
+{id: 2, name: "orange"}
+```
+
+#### `lineTerminator`
+
+A Table Dialect descriptor `MAY` have the `lineTerminator` property that `MUST` be a string; with default value `\r\n`. This property specifies the character sequence which terminates rows.
 
-A CSV Dialect descriptor, `dialect`, `MUST` be a JSON `object` with the following properties:
+For example, this data file:
+
+```csv
+id,name;1,apple;2,orange
+```
 
-- `delimiter` - specifies the character sequence which separates fields (aka columns). Default = `,`. Example `\t`. If not present, the default is `,`.
-- `lineTerminator` - specifies the character sequence which terminates rows. Default = `\r\n`
-- `quoteChar` - specifies a one-character string to use as the quoting character. Default = `"`
-- `doubleQuote` - controls the handling of quotes inside fields. If true, two consecutive quotes are interpreted as one. Default = `true`
-- `escapeChar` - specifies a one-character string to use for escaping (for example, `\`), mutually exclusive with `quoteChar`. Not set by default
-- `nullSequence` - specifies the null sequence (for example `\N`). Not set by default
-- `skipInitialSpace` - specifies how to interpret whitespace which immediately follows a delimiter; if `false`, it means that whitespace immediately after a delimiter is treated as part of the following field. Default = `false`
-- `header` - indicates whether the file includes a header row. If `true` the first row in the file is a header row, not data. Default = `true`
-- `commentChar` - indicates a one-character string to ignore any line whose row begins with this character. Not set by default
-- `caseSensitiveHeader` - indicates that case in the header is meaningful. For example, columns `CAT` and `Cat` are not equated. Default = `false`
-- `csvddfVersion` - a number, in n.n format, e.g., `1.2`. If not present, default is the latest schema version.
+With this dialect definition:
 
-### Example
+```json
+{
+  "lineTerminator": ";"
+}
+```
+
+`SHOULD` output this data:
+
+```javascript
+{id: 1, name: "apple"}
+{id: 2, name: "orange"}
+```
+
+#### `quoteChar`
+
+A Table Dialect descriptor `MAY` have the `quoteChar` property that `MUST` be a string of one character length with default value `"` (double quote). This property specifies a character to use for quoting in case the `delimiter` needs to be used inside a data cell.
+
+For example, this data file:
+
+```csv
+id,name
+1,'apple,fruits'
+2,'orange,fruits'
+```
 
-Here's an example:
+With this dialect definition:
 
 ```json
 {
-  "dialect": {
-    "csvddfVersion": 1.2,
-    "delimiter": ";",
-    "doubleQuote": true,
-    "lineTerminator": "\r\n",
-    "quoteChar": "\"",
-    "skipInitialSpace": true,
-    "header": true,
-    "commentChar": "#"
-  }
+  "quoteChar": "'"
 }
 ```
+
+`SHOULD` output this data:
+
+```javascript
+{id: 1, name: "apple,fruits"}
+{id: 2, name: "orange,fruits"}
+```
+
+#### `doubleQuote`
+
+A Table Dialect descriptor `MAY` have the `doubleQuote` property that `MUST` be boolean with default value `true`. This property controls the handling of `quoteChar` inside data cells. If true, two consecutive quotes are interpreted as one.
+
+For example, this data file:
+
+```csv
+id,name
+1,"apple""fruits"
+2,"orange""fruits"
+```
+
+With this dialect definition:
+
+```json
+{
+  "doubleQuote": true
+}
+```
+
+`SHOULD` output this data:
+
+```javascript
+{id: 1, name: 'apple"fruits'}
+{id: 2, name: 'orange"fruits'}
+```
+
+#### `escapeChar`
+
+A Table Dialect descriptor `MAY` have the `escapeChar` property that `MUST` be a string of one character length; undefined by default. This property specifies a one-character string to use for escaping, for example, `\`, mutually exclusive with `quoteChar`.
+
+For example, this data file:
+
+```csv
+id,name
+1,apple|,fruits
+2,orange|,fruits
+```
+
+With this dialect definition:
+
+```json
+{
+  "escapeChar": "|"
+}
+```
+
+`SHOULD` output this data:
+
+```javascript
+{id: 1, name: "apple,fruits"}
+{id: 2, name: "orange,fruits"}
+```
+
+#### `nullSequence`
+
+A Table Dialect descriptor `MAY` have the `nullSequence` property that `MUST` be a string; undefined by default. This property specifies specifies the null sequence, for example, `\N`.
+
+For example, this data file:
+
+```csv
+id,name
+1,apple
+2,NA
+```
+
+With this dialect definition:
+
+```json
+{
+  "nullSequence": "NA"
+}
+```
+
+`SHOULD` output this data:
+
+```javascript
+{id: 1, name: "apple"}
+{id: 2, name: null}
+```
+
+#### `skipInitialSpace`
+
+A Table Dialect descriptor `MAY` have the `skipInitialSpace` property that `MUST` be boolean with default value `false`. This property specifies how to interpret whitespace which immediately follows a delimiter; if `false`, it means that whitespace immediately after a delimiter is treated as part of the following field.
+
+For example, this data file:
+
+```csv
+id, name
+1, apple
+2, orange
+```
+
+With this dialect definition:
+
+```json
+{
+  "skipInitialSpace": true
+}
+```
+
+`SHOULD` output this data:
+
+```javascript
+{id: 1, name: "apple"}
+{id: 2, name: "orange"}
+```
+
+### Structured
+
+Structured formats is a group of structured or semi-structured formats such as JSON and YAML.
+
+#### `property`
+
+A Table Dialect descriptor `MAY` have the `property` property that `MUST` be a string; undefined by default. This property specifies where a data array is located in the data structure.
+
+For example, this data file:
+
+```json
+{
+  "rows": [
+    { "id": 1, "name": "apple" },
+    { "id": 2, "name": "orange" }
+  ]
+}
+```
+
+With this dialect definition:
+
+```json
+{
+  "property": "rows"
+}
+```
+
+`SHOULD` output this data:
+
+```javascript
+{id: 1, name: "apple"}
+{id: 2, name: "orange"}
+```
+
+#### `itemType`
+
+A Table Dialect descriptor `MAY` have the `itemType` property that `MUST` be a string with value `array` or `object`; undefined by default. This property specifies whether the data `property` contains an array of arrays or an array of objects.
+
+For example, this data file:
+
+```json
+[
+  ["id", "name"],
+  [1, "apple"],
+  [2, "orange"]
+]
+```
+
+With this dialect definition:
+
+```json
+{
+  "itemType": "array"
+}
+```
+
+`SHOULD` output this data:
+
+```javascript
+{id: 1, name: "apple"}
+{id: 2, name: "orange"}
+```
+
+#### `itemKeys`
+
+A Table Dialect descriptor `MAY` have the `itemKeys` property that `MUST` be array of strings; undefined by default. This property specifies the way of extracting rows from data arrays with `itemType` is `object`.
+
+For example, this data file:
+
+```json
+[
+  { "name": "apple", "id": 1, "count": 2 },
+  { "id": 2, "name": "orange", "count": 5 }
+]
+```
+
+With this dialect definition:
+
+```json
+{
+  "itemKeys": ["id", "name"]
+}
+```
+
+`SHOULD` output this data:
+
+```javascript
+{id: 1, name: "apple"}
+{id: 2, name: "orange"}
+```
+
+### Spreadsheet
+
+Spreadsheet formats is a group of sheet-based formats such as Excel or ODS.
+
+#### `sheetNumber`
+
+A Table Dialect descriptor `MAY` have the `sheetNumber` property that `MUST` be an integer with default value `1`. This property specifies a sheet number of a table in the spreadsheet file.
+
+For example, this data file:
+
+```txt
+Sheet 1
+Sheet 2
+```
+
+With this dialect definition:
+
+```json
+{
+  "sheetNumber": 2
+}
+```
+
+`SHOULD` output the data from the second sheet.
+
+#### `sheetName`
+
+A Table Dialect descriptor `MAY` have the `sheetName` property that `MUST` be a string; undefined by default. This property specifies a sheet name of a table in the spreadsheet file.
+
+For example, this data file:
+
+```txt
+Sheet 1
+Sheet 2
+```
+
+With this dialect definition:
+
+```json
+{
+  "sheetName": "Sheet 2"
+}
+```
+
+`SHOULD` output the data from the second sheet.
+
+## Example
+
+An example of a well-defined Table Dialect descriptor for a CSV format:
+
+```json
+{
+  "header": false,
+  "commentChar": "#"
+  "delimiter": ";",
+  "doubleQuote": true,
+  "lineTerminator": "\r\n",
+  "quoteChar": "\"",
+  "skipInitialSpace": true,
+}
+```
+
+## Excluded
+
+Table Dialect has nothing to do with the names, contents or types of the headers or data within the CSV file, only how it is formatted. However, CSV Dialect does allow the presence or absence of a header to be specified, similarly to [RFC4180](http://www.ietf.org/rfc/rfc4180.txt).
+
+Table Dialect is also orthogonal to the character encoding used in the CSV file. Note that it is possible for files in CSV format to contain data in more than one encoding.
+
+## References
+
+Some related work can be found in [this comparison of csv dialect support](https://docs.google.com/spreadsheet/ccc?key=0AmU3V2vcPKrIdEhoU1NQSWtoQmJwcUNCelJtdkx2bFE&usp=sharing), this [example of similar JSON format](http://panda.readthedocs.org/en/latest/api.html#data-uploads), and in Python's [PEP 305](http://www.python.org/dev/peps/pep-0305/).
diff --git a/profiles/dictionary/dialect.yaml b/profiles/dictionary/dialect.yaml
index 83f4dc80..6650be23 100644
--- a/profiles/dictionary/dialect.yaml
+++ b/profiles/dictionary/dialect.yaml
@@ -1,60 +1,75 @@
 tableDialect:
-  title: CSV Dialect
-  description: The CSV dialect descriptor.
-  type:
-    - string
-    - object
-  required:
-    - delimiter
-    - doubleQuote
+  title: Table Dialect
+  description: The Table dialect descriptor.
+  type: object
   properties:
-    csvddfVersion:
-      "$ref": "#/definitions/csvddfVersion"
+    header:
+      "$ref": "#/definitions/header"
+    headerRows:
+      "$ref": "#/definitions/headerRows"
+    headerJoin:
+      "$ref": "#/definitions/headerJoin"
+    commentRows:
+      "$ref": "#/definitions/commentRows"
+    commentChar:
+      "$ref": "#/definitions/commentChar"
     delimiter:
       "$ref": "#/definitions/delimiter"
-    doubleQuote:
-      "$ref": "#/definitions/doubleQuote"
     lineTerminator:
       "$ref": "#/definitions/lineTerminator"
-    nullSequence:
-      "$ref": "#/definitions/nullSequence"
     quoteChar:
       "$ref": "#/definitions/quoteChar"
+    doubleQuote:
+      "$ref": "#/definitions/doubleQuote"
     escapeChar:
       "$ref": "#/definitions/escapeChar"
+    nullSequence:
+      "$ref": "#/definitions/nullSequence"
     skipInitialSpace:
       "$ref": "#/definitions/skipInitialSpace"
-    header:
-      "$ref": "#/definitions/header"
-    commentChar:
-      "$ref": "#/definitions/commentChar"
-    caseSensitiveHeader:
-      "$ref": "#/definitions/caseSensitiveHeader"
+    property:
+      "$ref": "#/definitions/property"
+    itemType:
+      "$ref": "#/definitions/itemType"
+    itemKeys:
+      "$ref": "#/definitions/itemKeys"
+    sheetNumber:
+      "$ref": "#/definitions/sheetNumber"
+    sheetName:
+      "$ref": "#/definitions/sheetName"
+header:
+  title: Header
+  description: Specifies if the file includes a header row, always as the first row in the file.
+  type: boolean
+  default: true
   examples:
     - |
       {
-        "dialect": {
-          "delimiter": ";"
-        }
-      }
-    - |
-      {
-        "dialect": {
-          "delimiter": "\t",
-          "quoteChar": "'",
-          "commentChar": "#"
-        }
+        "header": true
       }
-csvddfVersion:
-  title: CSV Dialect schema version
-  description: A number to indicate the schema version of CSV Dialect. Version 1.0 was
-    named CSV Dialect Description Format and used different field names.
-  type: number
-  default: 1.2
-  examples::
+headerRows:
+  type: array
+  default: [1]
+  items:
+    type: integer
+    minimum: 1
+headerJoin:
+  type: string
+  default: " "
+commentRows:
+  type: array
+  default: [1]
+  items:
+    type: integer
+    minimum: 1
+commentChar:
+  title: Comment Character
+  description: Specifies that any row beginning with this one-character string, without preceeding whitespace, causes the entire line to be ignored.
+  type: string
+  examples:
     - |
       {
-        "csvddfVersion": "1.2"
+        "commentChar": "#"
       }
 delimiter:
   title: Delimiter
@@ -70,18 +85,6 @@ delimiter:
       {
         "delimiter": ";"
       }
-doubleQuote:
-  title: Double Quote
-  description: Specifies the handling of quotes inside fields.
-  context: If Double Quote is set to true, two consecutive quotes must be interpreted
-    as one.
-  type: boolean
-  default: true
-  examples:
-    - |
-      {
-        "doubleQuote": true
-      }
 lineTerminator:
   title: Line Terminator
   description: Specifies the character sequence that must be used to terminate rows.
@@ -96,14 +99,17 @@ lineTerminator:
       {
         "lineTerminator": "\n"
       }
-nullSequence:
-  title: Null Sequence
-  description: Specifies the null sequence, for example, `\N`.
-  type: string
+doubleQuote:
+  title: Double Quote
+  description: Specifies the handling of quotes inside fields.
+  context: If Double Quote is set to true, two consecutive quotes must be interpreted
+    as one.
+  type: boolean
+  default: true
   examples:
     - |
       {
-        "nullSequence": "\N"
+        "doubleQuote": true
       }
 quoteChar:
   title: Quote Character
@@ -124,6 +130,15 @@ escapeChar:
       {
         "escapeChar": "\\"
       }
+nullSequence:
+  title: Null Sequence
+  description: Specifies the null sequence, for example, `\N`.
+  type: string
+  examples:
+    - |
+      {
+        "nullSequence": "\N"
+      }
 skipInitialSpace:
   title: Skip Initial Space
   description: Specifies the interpretation of whitespace immediately following
@@ -136,35 +151,19 @@ skipInitialSpace:
       {
         "skipInitialSpace": true
       }
-header:
-  title: Header
-  description: Specifies if the file includes a header row, always as the first
-    row in the file.
-  type: boolean
-  default: true
-  examples:
-    - |
-      {
-        "header": true
-      }
-commentChar:
-  title: Comment Character
-  description: Specifies that any row beginning with this one-character string, without preceeding whitespace, causes the entire line to be ignored.
+property:
+  type: string
+itemType:
+  type: string
+  enum:
+    - array
+    - object
+itemKeys:
+  type: array
+  items:
+    type: string
+sheetNumber:
+  type: integer
+  minimum: 1
+sheetName:
   type: string
-  examples:
-    - |
-      {
-        "commentChar": "#"
-      }
-caseSensitiveHeader:
-  title: Case Sensitive Header
-  description: Specifies if the case of headers is meaningful.
-  context: Use of case in source CSV files is not always an intentional decision.
-    For example, should "CAT" and "Cat" be considered to have the same meaning.
-  type: boolean
-  default: false
-  examples:
-    - |
-      {
-        "caseSensitiveHeader": true
-      }