Changed how the classloader was used.