Add back the classloader - see if it still works