Added support for packages, too