Now reflects normalized tables.