Rework directory local variables