Add :any_order
Add _MATCH constants
Add some accessor functions