Added figure support.