fix(code): Update code following refactor of tables (refs #4624)
Merge pull request #28 from eguaj/2.1-A4624

fix(code): Update code following refactor of tables (closes #4624)