Change how serialization works