Improved the use of custom tables.