Made some classes serializable