Improved module definitions.