Moved preloading to controller