Renamed methods and added missing method