Add lazy loading in management mode