Although this point is valid it is out of scope of this change and should be refactored in the future