NSS package consolidation