[PLAT-6007] Improve loader (Andrew Griffin)