Added more keywords to generic keywords