Updating the doc.
Code refactoring and new message option.