Lots of changes to the Table module