Adapting for the new .when() functionality of the base operation