models. It's a better semantic and improve performance as well as
readability of the code. All the tests passes (except the remark in the
last commit).