Made many other classes serializable