fix(code): Update code following refactor of tables (refs #4619)
Merge pull request #12 from eguaj/1.2-A4619

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