Added figure & graphic support.