Renamed column row to current_row in schema