More Documentation
Improved message generation