Added tabular mapping