Update dependencies
Add some more keywords