New version makes use of modules.