Update DI

Only the first commit is necesary for updating DI, the second one is just using the new feature (injecting non-annotated tokens as value).