Imrproved support for custom cross tables.