Updates for new snap-in code