Update to new module format