Refactoring: data loading is now lazy.