fix(code): Update code following refactor of tables (refs #4620)
Merge pull request #7 from eguaj/1.0-A4620

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