Re-added wait_for_service lines