Improved name server