made some more classes serializable