made some changes to table definitions.