Add source and target names to serialization