Add lazy class matcher
Add ability to use class matcher