Indeed. But this require a bigger redesign which shouldn't be mixed with functional code :/