@sabcio I assume I can DRY this up during the release?