Updates to the doAction functionality