Refactoring lazyload support patch