Added support for custom tables.