Added a @todo for serialization