Uses the new module design