That's another planned part of refactoring later, I did not want to change that much at once