Updated module to work with SS 3.x

Tested against 3.1.x-dev