I agree we could use a custom Status type. I'll take care of it in a separate PR.