Hacked in some temporary content type parsing