Comment added for directory server handling