Added support for figures