Add includedClasses and includedPackages #517