Geometry Data rework to be less confusing