Modify Objects to be Serializable