Improve the raw table data and processing