Improved content parsing