Add Tables for Modules, some data fixes