Added better content handling