Code refactoring and new message option.