Improvements to the lazy collection fetching