Update to address review comments