Added System.Directory support