Added circle and oval