Update manifest
Documentation
Rework