Serialization improvements, tag datastructure enhancements.