added some more kw classes