Adapted to the changes to modules.