fix(code): Update code following refactor of tables (refs #4614)
Merge pull request #23 from eguaj/1.4-A4614

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