- refactoring of messaging solution (preparing for other project to reause approach)