Make lazy loading optional