Add support for keywords and add description and keywords