Rework of LayerManager’s NCWMS