add figure to image property & wrapper class option