Missed some of the directory variables
Guards for other directory variables