Update to remove WhistInfo constructor call
Update to remove deprecated property call
Add Serializable attribute