Adding support for custom tables