Account for the changes to modules and logging