added geometry classes