Updates to reflect community feedback