Updated table selector