improve Figure API