Added sort of message wrap to standartize listeners