[Upg] Lazyload flag

next, must implement lazy load switch in remaining methods