Changing to a DirSource to avoid cyclic dependency