+ added back the module class suffix option