Add table methods
Merge branch 'j321-version' into staging