Fix to handle table definition
Fix to handle table definition
Fix to handle table definition