I agree! But it is a very complex change. Let's address it in an another pull request