Handle lazy loading or provider. Close #13