Will keep it in mind for a future change, I don't want to rewrite the whole class as part of this change.