Make more classes serializable