Added changes to support the protocol / service behaviour information now available.