fix(code): Update code following refactor of tables (refs #4615)
Merge pull request #15 from eguaj/1.0-A4615

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