Add basic setup for SS3.1 support