Add internal stack nodes; remove srfAttach