Improved lazy loading