Added Sphere and Macro classes