Use IDirectory interface where possible