Updating to use context classloader