Updated replacement for modules.