Improved modules support.