I fully agree. I would love to see a 1-to-1 mapping in the future, and a better control of the stakes if they need to be accounted for. A good option would be to do this on-chain. But this is something that will be discussed in the following weeks anyways.

Thanks for the feedback!