Added AddWhenSet() method.