VersionLocator replacement

VersionLocator replacement