I'll note that and revisit when I'm implementing the next set of changes. I can also use the same thing on DynamisHelper.