Change from lazy loading to data.