#259

We have to understand the architecture before to add new classes. And this fix is urgent.