Attempt to make this module ss3.1 compatible

Attempt to make this module ss3.1 compatible, did i forget something ?