Several enhancements for NBSAP.