Added classes for Triangle and Sphere based on CompositeSurface