Add when and unless syntax