adding support for links and tables