Replace __add__ with add_messages