Move contentType support into Item class