Adapt to new module pattern