Updated to current version of the module