Added support for table prefix