Updated table definitions