Tables changes

Issue #37.