Update for the new modules system