Added table prefix for custom table prefixes