We could introduce this change in the next PR.