Added rectangle and oval shapes.