Added "package_name_map" param
Added "package_name_map" param