[FEAT] lazy loading complete