New configure table construction
Merge pull request #491 from seandst/configure-tables

New configure table construction