refactor, add new keyword adding