Updated name server code