Updates to address the review comments