Simplified Geometry management for states