Decouple directory access