Added support for the custom table.