Added support for specifying the search scope of classes.