I think you're right, we can do that in a later PR