Adding keywords in contexts. #5