Handle review comments from Nischal