Made dirctory agnostic