Added support for table selects