Changed how the keyword is retrieved