Last changes to the module