Changes as per the latest PR review