Further refined SOC SND support