Updated module to work with SS3.1