Feature/add lazy loading support