Save class now supports HBT, but it's not used (yet)