Updates to incorporate review feedback