Updated class loading stuff