Added support for table. Need to fix some issues related to the table...