Added ellipse and rectangle models