Added support in Runtime and SNS for OS X