Fixed visitor for serialization phase