Added new logic for announce request/response.