[Version Control] Use the new refactored functions.