Add TODO to deserialization