It is now cleaner, as no new header and cpp is needed, but now you access stuff in the core directly, which should/could be circumvented, if you would add a getter in clientmodel (@laanwj What do you think?). You don't need to change this yet, I would wait for further comments :).