Add initial work for SS3.1 support