Update to new Directory API