Moved matcher to utils