Added new table selection functionality