Updated w.r.t. pull request review comments