Added figure management.