Little refactor in the code of the model dict-like api