Added preliminary support for packages.