Enhanced the VersionSerializer