This can be addressed in a planned larger refactor.