I think that this should also be updated to have "circular serialization"