Refactor of MessagingService, only send messages