Changes for JarLoading