Adding modifications as per conversations