1) Updated the snippet to use a non blocking way to consume the future
2) Removed the lazy loading
Merge branch 'develop'