Updated keword_sets and keywords

Signed-off-by: Deepak Kundu <dpk@brahmapk.com>