Fixed loading of custom classes