Fixed: Saving/loading for new classes (especially early EOF for BaseFacility).