I think that we can let as is and later @marc-mabe can send a PR improving the performance along all the framework.