[Fix] finished integrating lazy loading