* Refactored the notifications
* Implemented a builder to build different kind of messages