Lifetime scoping added for DI