is the plan to inject the *Directory's at some point?