Generally I agree, but I think that such change needs a designs and is not in the scope of this commit.