Merged saveState(Externalizable) into the same implementation as
saveState(Serializable)