Improvements to content handling