Made changes to incorporate master branch fix of lazy load