Fixed class preloading