add lazy loading
Merge branch 'feature/lazy_loading'

* feature/lazy_loading:
  add lazy loading