Using new geometry data structure
Removed hard-coded values / types