Added observer and multicast client support