Improved module creation.