Modifications to the module system