Working copy of class based matcher