Added directory server handling, partlyl