@tolis-e I'm not picky about OO or not, was just a suggestion. Why not into this PR? Any specific reason?