Add fig support