More changes to make this module work with version 7.0