Improved module support.