adding support for table suffix