Updated docs
Upgrade bundled modules and update keywords