Fixed class loading