Add support for tables and links