Improved content framework