Tweak PackageCommand