VersionLocator replacement