Add support for table prefix