Fixed table_view to use the new API