Bunch of enhancements around content providers