[WIP][FEATURE] Lazy Dependency Injection amended