add TODO to serialization