Added WaitGroup for services