[Yujun] Added support for table.