Agree, I will address that in a separate PR.