Updated the table defns