Improve visitor, serialization.