Add preloading support