added rectangle/diamond/circle endpoints