Bug-1443; first part of implementing complete directory