It would ease refactoring as well