Added interfaces to objects that need serializing