Updated receiving of messages