Added extracting of module name