Add keyphrase support