Added plural handling for hand tools when saving a package