Added Geometry macro.
Added Version macro.