[2982] Updates to address review comments