Absolutely, yes, but that refactoring is left for other tickets.