New version of modules system