Added keyword editing