can we mark this Serializable just to reduce chances that we have issues?