Agreed! We will rework this for the 3.0 release.

Thanks for the suggestion!