Added fig support