Updated the Smart Grid to use Grid and CategoryGrid tables.