Add Fig support