Replace old VersionComparator