Added extra_package_name parameter