Yes, I'll update this PR to reuse these.