Merged PCAP service into build