I don't think there is a different way of doing it. I'll create a PR for it later today, maybe you can suggest a better way of doing it