Rework into newer table format