After porting to d7, still need to support d6
Support new classloader