Add support for fig