Added directory control