Major fix in table architecture;