Add in preload data handling