Update refactoring functins to the oldest ones