Added functionality for new table format.