Improved content_handler