Ellipse, Circle. Added constructors and setters