Added protocol selection support