Add Directory Environment support