Document new 'when' functionality