Dep becomes a transformer, refactoring for Types