Added protocol and delegate for name lookup