Yes, for sure, that's the right way to do it. I'll add them in the next iteration