Added tabular mappings