Change to allow options being passed as bool