Added support for packages.