I propose to wait the refactoring of kie and after that we can have review this question