Added some serializable stuff that was accidentally removed during conversion.