FIX: Improving lazy loading body

Signed-off-by: arturkandurengagepoint <artur.kandur@engagepoint.com>