Updated module to work with 3.x