Geometry: Added missing singletons.