Adding TODO for lazy loading