yep, long term it would be the correct solution. Unfortunately I dont have time to do it now, and it should be a new New feature Issue anyway..