Reworked tables to be standalone, so that the existing tables are not changed at all