CON-21: Message refactoring and some doc added