Add new messaging system support to connect logic