Added support for matcher classes in CSM