Working towards SNS support