[TASK] Use lazy DI with fixes