Added WHEN-PACKAGES feature.