Added support to table prefix and sufix