Add support for table joins