Fixed some missing factories.
Merged
added DI package