I wanted to modify models as less as possible. Anyway, noted. I'll do it the other way. You can discard that pull request as I will be starting from scratch.