Issue #171 added tables