Update to new sapphire lazyload mechanism