Updates to address review feedback