Restructure for reference table