Restructure (easier to add new records).