Updates to reflect new functionality