Fix scanClass support for all packages