Made tables configurable