[TASK] Lazy loading - #67