Continuing to work on re-factoring tables