X2FileDriver: I forgot a class...