Refactor: Move freeze/thaw code into separate Storable class