Move geometry to base matcher