Modified objects to implement Serializable