Move geometry to base matcher
Move geometry to base matcher
Move geometry to base matcher
Move geometry to base matcher
add extra verbose for analyzer