Added preload support