Started making tables configurable