More refactoring
vatchTable