Update to make serializable