SNS Upgrade

This is a companion PR for #741