Add initial changes for SS3.1 support