Update for new modules