Added tabular data support