Final changes for the new module