add support for tables
replace tables type supported