Totally agree, but I don't want to tackle the monolith in this PR.