Implement more lazy loading for completed