Add ability to set the keywords for the doc; Add missing use statements