@dpobel I tend to agree for the time being, will change it to how it is done in legacy.