add given/when keywords