Changed addKeywordsToType() to typeWithKeywords()