Added Keywords + Fixed For Codeivate Integration