Some changes in class Figure.